DD-337 : Validate the version folder before setting it and show error dialog if error

2 files changed, 24 insertions, 1 deletions

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 4d9bfa20bb..d7a5594bb1 100755
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -3113,7 +3113,17 @@ void LLFolderBridge::performAction(LLInventoryModel* model, std::string action)
         if (depth_nesting_in_marketplace(mUUID) == 2)
         {
 			LLInventoryCategory* category = gInventory.getCategory(mUUID);
-            LLMarketplaceData::instance().setVersionFolder(category->getParentUUID(), mUUID);
+            mMessage = "";
+            if (!validate_marketplacelistings(category,boost::bind(&LLFolderBridge::gatherMessage, this, _1, _2, _3),false,2))
+            {
+                LLSD subs;
+                subs["[ERROR_CODE]"] = mMessage;
+                LLNotificationsUtil::add("MerchantFolderActivationFailed", subs);
+            }
+            else
+            {
+                LLMarketplaceData::instance().setVersionFolder(category->getParentUUID(), mUUID);
+            }
         }
 		return;
 	}
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6d672d29f1..8453152613 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -374,6 +374,19 @@ Initialization with the Marketplace failed because of a system or network error.
     </notification>
     
     <notification
+        icon="OutboxStatus_Error"
+        name="MerchantFolderActivationFailed"
+        type="outbox">
+        Activating this version folder failed with error :
+
+        &apos;[ERROR_CODE]&apos;
+
+        <usetemplate
+        name="okbutton"
+        yestext="OK"/>
+    </notification>
+
+    <notification
         icon="alertmodal.tga"
         name="ConfirmMerchantActiveChange"
         type="alertmodal">