summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-04-22 19:32:10 -0700
committerMerov Linden <merov@lindenlab.com>2014-04-22 19:32:10 -0700
commit277539e5624f9a71186568d4a2d506033f76e312 (patch)
tree49ba8c65f681e6abcf5e6768df2536c8c94124ba
parent97f76ab882de2088c96b386eba8f222e3b911689 (diff)
DD-68 : Suppress the listing if a listing folder is cut when associated but not listed
-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 d43de30c84..d02ea949a8 100755
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -3528,6 +3528,8 @@ void LLFolderBridge::pasteFromClipboard()
llassert(vicat);
if (vicat)
{
+ // Clear the cut folder from the marketplace if it was a listing folder (moot if not listed)
+ LLMarketplaceData::instance().deleteListing(item_id);
if (move_is_into_marketplacelistings)
{
move_folder_to_marketplacelistings(vicat, parent_id);