summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-04-22 19:06:44 -0700
committerMerov Linden <merov@lindenlab.com>2014-04-22 19:06:44 -0700
commit97f76ab882de2088c96b386eba8f222e3b911689 (patch)
treef90a6def9a65eaa464962fe62ed3785f7cc8b090 /indra/newview
parent4ec13dcf8c331bc39a00aa6fec8397b6714172ba (diff)
DD-68 : Suppress the listing if a listing folder is dragged outside the marketplace back into the inventory
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llinventorybridge.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index a9d5768854..d43de30c84 100755
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2753,6 +2753,8 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
if (move_is_from_marketplacelistings)
{
update_marketplace_category(from_folder_uuid);
+ // Clear the folder from the marketplace in case it was a listing folder (moot if not listed)
+ LLMarketplaceData::instance().deleteListing(cat_id);
}
}
}