From 824c21ef6e092464d1a6c7a46625adc53499bc5b Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Mon, 9 Jun 2014 14:10:01 -0700 Subject: DD-107, DD-111 : Fixed! Do not allow active listing and version folders to be moved or cut or deleted (must unlist first). --- indra/newview/llinventorybridge.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index c50f3f8041..cd5da96e24 100755 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2435,6 +2435,13 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat, // One cannot move a folder into a stock folder is_movable = (getPreferredType() != LLFolderType::FT_MARKETPLACE_STOCK); } + + if (is_movable && move_is_from_marketplacelistings) + { + // If the incoming folder is listed and active (and is therefore either the listing or the version folder), then moving is *not* allowed + is_movable = !LLMarketplaceData::instance().getActivationState(cat_id); + } + if (is_movable && (move_is_into_outbox || move_is_into_marketplacelistings)) { const LLViewerInventoryCategory * master_folder = (move_is_into_outbox ? model->getFirstDescendantOf(outbox_id, mUUID) : model->getFirstDescendantOf(marketplacelistings_id, mUUID)); -- cgit v1.3