FIRE-13477: Prevent Antispam from spamming the user with block messages if an object is blocked who's owner has been blocked already

Mon, 08 Dec 2014 15:02:39 +0100

author
Ansariel
date
Mon, 08 Dec 2014 15:02:39 +0100
changeset 43040
07c463e82d74
parent 43039
bf80787cf882
child 43041
f3e9cd0b642d

FIRE-13477: Prevent Antispam from spamming the user with block messages if an object is blocked who's owner has been blocked already

indra/newview/NACLantispam.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/NACLantispam.cpp	Mon Dec 08 13:08:03 2014 +0000
     1.2 +++ b/indra/newview/NACLantispam.cpp	Mon Dec 08 15:02:39 2014 +0100
     1.3 @@ -656,8 +656,11 @@
     1.4  	{
     1.5  		AntispamObjectData data = found->second;
     1.6  
     1.7 -		data.mName = LLSLURL("objectim", id, "").getSLURLString() + "?name=" + LLURI::escape(name) + "&owner=" + owner_id.asString();
     1.8 -		notify(data);
     1.9 +		if (!isBlockedOnQueue(data.mQueue, owner_id))
    1.10 +		{
    1.11 +			data.mName = LLSLURL("objectim", id, "").getSLURLString() + "?name=" + LLURI::escape(name) + "&owner=" + owner_id.asString();
    1.12 +			notify(data);
    1.13 +		}
    1.14  
    1.15  		mObjectData.erase(found);
    1.16  	}

mercurial