summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-11-08 11:48:35 -0800
committerMerov Linden <merov@lindenlab.com>2014-11-08 11:48:35 -0800
commit23a5b43cb923654f7779f4424c1bb2a374bbd2a5 (patch)
treec4af299e0a24b4eef49024b75f208846cc9303a8 /indra/newview
parent2939a542f97c5643457f0087915c733b949a0eb9 (diff)
DD-260 : Silence the SLM delete message so to prevent server notification to show up when deleting or unassociating things from the viewer
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llviewermessage.cpp8
1 files changed, 5 insertions, 3 deletions
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());
}
}