summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-09-16 10:39:23 -0700
committerMerov Linden <merov@lindenlab.com>2014-09-16 10:39:23 -0700
commit1a334a1005d116b99eca45c1e4a1a475c9dba68d (patch)
tree2936669f108d49548c6c40b284bafc4a2f2ac668 /indra/newview/llviewermessage.cpp
parent221c184ebb5e20440cde974ac2bc5eab84690dd4 (diff)
DD-23 : WIP : Catch the SLM_UPDATE_FOLDER notification and trigger the GET /listing route so to get the updated SLM status for the listing
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rwxr-xr-xindra/newview/llviewermessage.cpp16
1 files changed, 14 insertions, 2 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 332d04a1f4..24c341d73d 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -71,6 +71,7 @@
#include "llinventoryobserver.h"
#include "llinventorypanel.h"
#include "llfloaterimnearbychat.h"
+#include "llmarketplacefunctions.h"
#include "llnotifications.h"
#include "llnotificationsutil.h"
#include "llpanelgrouplandmoney.h"
@@ -5873,7 +5874,7 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem)
LL_WARNS() << "attempt_standard_notification: Attempted to read notification parameter data into LLSD but failed:" << llsdRaw << LL_ENDL;
}
}
-
+
if (
(notificationID == "RegionEntryAccessBlocked") ||
(notificationID == "LandClaimAccessBlocked") ||
@@ -5954,7 +5955,18 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem)
make_ui_sound("UISndRestart");
}
-
+
+ // WIP for DD-23 : Suppress those printouts once tested
+ llinfos << "Merov : notificationID = " << notificationID << llendl;
+ llinfos << "Merov : listing_id = " << llsdBlock["listing_id"].asInteger() << llendl;
+ // 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() 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());
+ }
+
LLNotificationsUtil::add(notificationID, llsdBlock);
return true;
}