summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-09-09 19:02:28 -0700
committerMerov Linden <merov@lindenlab.com>2014-09-09 19:02:28 -0700
commit4f467d6e1a96d8323eaafb8bac3192cffef4635c (patch)
tree16e5537248289a1426a306678153bc67c8b1e18c
parentc4577856ed913ba7070a6bd1ad8e91c454e7bd6c (diff)
DD-106 : Suppress validation of target folder when associating since we unlist before hand
-rwxr-xr-xindra/newview/llinventorybridge.cpp13
1 files changed, 1 insertions, 12 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 75883ac002..47afd6e78c 100755
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -3088,18 +3088,7 @@ void LLFolderBridge::performAction(LLInventoryModel* model, std::string action)
}
else if ("marketplace_associate_listing" == action)
{
- LLViewerInventoryCategory* cat = gInventory.getCategory(mUUID);
- mMessage = "";
- if (!validate_marketplacelistings(cat,boost::bind(&LLFolderBridge::gatherMessage, this, _1, _2)))
- {
- LLSD subs;
- subs["[ERROR_CODE]"] = mMessage;
- LLNotificationsUtil::add("MerchantListingFailed", subs);
- }
- else
- {
- LLFloaterAssociateListing::show(mUUID);
- }
+ LLFloaterAssociateListing::show(mUUID);
return;
}
else if ("marketplace_edit_listing" == action)