From e5afc12660ef77218b086d4eafe1c8bf197ce143 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 8 Dec 2014 15:02:39 +0100 Subject: [PATCH] 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 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/indra/newview/NACLantispam.cpp b/indra/newview/NACLantispam.cpp index 3d55bede7d..eb2e9f792a 100644 --- a/indra/newview/NACLantispam.cpp +++ b/indra/newview/NACLantispam.cpp @@ -656,8 +656,11 @@ void NACLAntiSpamRegistry::processObjectPropertiesFamily(LLMessageSystem* msg) { AntispamObjectData data = found->second; - data.mName = LLSLURL("objectim", id, "").getSLURLString() + "?name=" + LLURI::escape(name) + "&owner=" + owner_id.asString(); - notify(data); + if (!isBlockedOnQueue(data.mQueue, owner_id)) + { + data.mName = LLSLURL("objectim", id, "").getSLURLString() + "?name=" + LLURI::escape(name) + "&owner=" + owner_id.asString(); + notify(data); + } mObjectData.erase(found); }