From 97fc50e1618b5441d6c7f305506801b85b4caacd Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 9 Jun 2015 23:00:14 -0700
Subject: DD-412 : Fixes the hierarchy before creating a listing and warn the
 user

---
 indra/newview/llinventorybridge.cpp                  | 4 ++--
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 8b37480830..d8dfe35eb5 100755
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -3236,8 +3236,8 @@ void LLFolderBridge::performAction(LLInventoryModel* model, std::string action)
 	{
         LLViewerInventoryCategory* cat = gInventory.getCategory(mUUID);
         mMessage = "";
-        bool validates = true;
-        if (!validate_marketplacelistings(cat,boost::bind(&LLFolderBridge::gatherMessage, this, _1, _2, _3)))
+        bool validates = validate_marketplacelistings(cat,boost::bind(&LLFolderBridge::gatherMessage, this, _1, _2, _3),false);
+        if (!validates)
         {
             mMessage = "";
             validates = validate_marketplacelistings(cat,boost::bind(&LLFolderBridge::gatherMessage, this, _1, _2, _3),true);
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5fc23b6d4b..03f7de34ed 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -393,7 +393,7 @@ Initialization with the Marketplace failed because of a system or network error.
         In order to create your listing, we fixed the hierarchy of your listing contents.
         <tag>confirm</tag>
         <usetemplate
-            ignoretext="Confirm when creating a listing validates the content"
+            ignoretext="Warn me that creating a listing fixes the hierarchy of the content"
             name="okignore" 
             yestext="OK"/>
     </notification>
-- 
cgit v1.2.3