From 85d05c71306489d92212cd5f3e166eff540d8da1 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 13 Feb 2017 11:04:42 +0200
Subject: [PATCH] MAINT-5556 Active listing folder stays listed, with empty
Version folder
---
indra/newview/llinventorybridge.cpp | 44 +++++++++++++++++++++++------
1 file changed, 36 insertions(+), 8 deletions(-)
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index b7f5424f255..6cb7ce622f8 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -275,8 +275,10 @@ BOOL LLInvFVBridge::cutToClipboard()
if (cut_from_marketplacelistings && (LLMarketplaceData::instance().isInActiveFolder(mUUID) ||
LLMarketplaceData::instance().isListedAndActive(mUUID)))
{
- // Prompt the user if cutting from a marketplace active listing
- LLNotificationsUtil::add("ConfirmMerchantActiveChange", LLSD(), LLSD(), boost::bind(&LLInvFVBridge::callback_cutToClipboard, this, _1, _2));
+ LLUUID parent_uuid = obj->getParentUUID();
+ BOOL result = perform_cutToClipboard();
+ gInventory.addChangedMask(LLInventoryObserver::STRUCTURE, parent_uuid);
+ return result;
}
else
{
@@ -303,11 +305,7 @@ BOOL LLInvFVBridge::callback_cutToClipboard(const LLSD& notification, const LLSD
S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
if (option == 0) // YES
{
- const LLInventoryObject* obj = gInventory.getObject(mUUID);
- LLUUID parent_uuid = obj->getParentUUID();
- BOOL result = perform_cutToClipboard();
- gInventory.addChangedMask(LLInventoryObserver::STRUCTURE, parent_uuid);
- return result;
+ return perform_cutToClipboard();
}
return FALSE;
}
@@ -3471,7 +3469,24 @@ void LLFolderBridge::pasteFromClipboard()
const LLUUID &marketplacelistings_id = model->findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
const BOOL paste_into_marketplacelistings = model->isObjectDescendentOf(mUUID, marketplacelistings_id);
- if (paste_into_marketplacelistings && !LLMarketplaceData::instance().isListed(mUUID) && LLMarketplaceData::instance().isInActiveFolder(mUUID))
+ BOOL cut_from_marketplacelistings = FALSE;
+ if (LLClipboard::instance().isCutMode())
+ {
+ //Items are not removed from folder on "cut", so we need update listing folder on "paste" operation
+ std::vector<LLUUID> objects;
+ LLClipboard::instance().pasteFromClipboard(objects);
+ for (std::vector<LLUUID>::const_iterator iter = objects.begin(); iter != objects.end(); ++iter)
+ {
+ const LLUUID& item_id = (*iter);
+ if(gInventory.isObjectDescendentOf(item_id, marketplacelistings_id) && (LLMarketplaceData::instance().isInActiveFolder(item_id) ||
+ LLMarketplaceData::instance().isListedAndActive(item_id)))
+ {
+ cut_from_marketplacelistings = TRUE;
+ break;
+ }
+ }
+ }
+ if (cut_from_marketplacelistings || (paste_into_marketplacelistings && !LLMarketplaceData::instance().isListed(mUUID) && LLMarketplaceData::instance().isInActiveFolder(mUUID)))
{
// Prompt the user if pasting in a marketplace active version listing (note that pasting right under the listing folder root doesn't need a prompt)
LLNotificationsUtil::add("ConfirmMerchantActiveChange", LLSD(), LLSD(), boost::bind(&LLFolderBridge::callback_pasteFromClipboard, this, _1, _2));
@@ -3490,7 +3505,20 @@ void LLFolderBridge::callback_pasteFromClipboard(const LLSD& notification, const
S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
if (option == 0) // YES
{
+ std::vector<LLUUID> objects;
+ std::set<LLUUID> parent_folders;
+ LLClipboard::instance().pasteFromClipboard(objects);
+ for (std::vector<LLUUID>::const_iterator iter = objects.begin(); iter != objects.end(); ++iter)
+ {
+ const LLInventoryObject* obj = gInventory.getObject(*iter);
+ parent_folders.insert(obj->getParentUUID());
+ }
perform_pasteFromClipboard();
+ for (std::set<LLUUID>::const_iterator iter = parent_folders.begin(); iter != parent_folders.end(); ++iter)
+ {
+ gInventory.addChangedMask(LLInventoryObserver::STRUCTURE, *iter);
+ }
+
}
}
--
GitLab