From 23a5b43cb923654f7779f4424c1bb2a374bbd2a5 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Sat, 8 Nov 2014 11:48:35 -0800 Subject: DD-260 : Silence the SLM delete message so to prevent server notification to show up when deleting or unassociating things from the viewer --- indra/newview/llviewermessage.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'indra') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 31bd022b50..75a5688827 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -5968,15 +5968,17 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem) // Special Marketplace update notification if (notificationID == "SLM_UPDATE_FOLDER") { - // In general, no message will be displayed, all we want is to get the listing updated in the marketplace floater - // If getListing() or deleteListing() fails though, the message of the alert will be shown by the caller of attempt_standard_notification() std::string state = llsdBlock["state"].asString(); if (state == "deleted") { - return LLMarketplaceData::instance().deleteListing(llsdBlock["listing_id"].asInteger()); + // Perform the deletion viewer side, no alert shown in this case + LLMarketplaceData::instance().deleteListing(llsdBlock["listing_id"].asInteger()); + return true; } else { + // In general, no message will be displayed, all we want is to get the listing updated in the marketplace floater + // If getListing() fails though, the message of the alert will be shown by the caller of attempt_standard_notification() return LLMarketplaceData::instance().getListing(llsdBlock["listing_id"].asInteger()); } } -- cgit v1.2.3