diff options
author | Merov Linden <merov@lindenlab.com> | 2015-06-09 23:00:14 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2015-06-09 23:00:14 -0700 |
commit | 97fc50e1618b5441d6c7f305506801b85b4caacd (patch) | |
tree | 78b94c245b6b85f2036885d54b182b3e5fda3d64 /indra/newview | |
parent | 84a7394ae03608556b5974ca1bdfc280cf5874b7 (diff) |
DD-412 : Fixes the hierarchy before creating a listing and warn the user
Diffstat (limited to 'indra/newview')
-rwxr-xr-x | indra/newview/llinventorybridge.cpp | 4 | ||||
-rwxr-xr-x | 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> |