DD-224, DD-246 : Clean up code when receiving delete notification. Display DAMA alert when associating listing

3 files changed, 16 insertions, 2 deletions

diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp
index 5e4615dbda..ea2364ef86 100755
--- a/indra/newview/llmarketplacefunctions.cpp
+++ b/indra/newview/llmarketplacefunctions.cpp
@@ -531,6 +531,9 @@ public:
             // Add the new association
             LLMarketplaceData::instance().addListing(folder_id,listing_id,version_id,is_listed);
             LLMarketplaceData::instance().setListingURL(folder_id, edit_url);
+
+            // Alert with DAMA informing the user that a version folder must be designated
+            LLNotificationsUtil::add("AlertMerchantAssociateNeedsVersion");
             it++;
         }
         
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 931b16ccb7..31bd022b50 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5968,10 +5968,9 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem)
         // Special Marketplace update notification
 		if (notificationID == "SLM_UPDATE_FOLDER")
         {
-            std::string state = llsdBlock["state"].asString();
-            llinfos << "Merov : SLM_UPDATE_FOLDER, state = " << state << ", id = " << llsdBlock["listing_id"].asInteger() << llendl;
             // 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());
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 990ba2dea3..70f3f86102 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -384,6 +384,18 @@ Initialization with the Marketplace failed because of a system or network error.
 
     <notification
         icon="alertmodal.tga"
+        name="AlertMerchantAssociateNeedsVersion"
+        type="alertmodal">
+        Before you can activate this listing or edit it on the Marketplace web site, you will need to activate a version folder.
+        <tag>confirm</tag>
+        <usetemplate
+        ignoretext="Alert about version folder requirements when I associate a listing with an existing listing id"
+        name="okignore"
+        yestext="OK"/>
+    </notification>
+
+    <notification
+        icon="alertmodal.tga"
         name="AlertMerchantListingNotUpdated"
         type="alertmodal">
 This listing could not be updated.