From dfe8416ca6fcdcb8863cd838fd6eb2ef42ef9c0f Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 10 Jun 2014 20:58:59 -0700
Subject: DD-107, DD-111 : Add a tooltip to indicate why you can't move an
 active listing

---
 indra/newview/llinventorybridge.cpp            | 13 +++++++------
 indra/newview/skins/default/xui/en/strings.xml |  1 +
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 84cf62f910..5e9079775a 100755
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2354,6 +2354,13 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
 
 		BOOL is_movable = TRUE;
 
+        if (is_movable && move_is_from_marketplacelistings && LLMarketplaceData::instance().getActivationState(cat_id))
+        {
+            // 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 = FALSE;
+            tooltip_msg = LLTrans::getString("TooltipOutboxDragActive");
+        }
 		if (is_movable && (mUUID == cat_id))
 		{
 			is_movable = FALSE;
@@ -2429,12 +2436,6 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
             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));
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 37648ed634..2e8970b09f 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -219,6 +219,7 @@ Please try logging in again in a minute.</string>
 	<string name="TooltipOutboxFolderLevels">Depth of nested folders exceeds [AMOUNT]</string>
 	<string name="TooltipOutboxTooManyFolders">Subfolder count in top-level folder exceeds [AMOUNT]</string>
 	<string name="TooltipOutboxTooManyObjects">Item count in top-level folder exceeds [AMOUNT]</string>
+	<string name="TooltipOutboxDragActive">You can't move an active listed listing</string>
 	
 	<string name="TooltipDragOntoOwnChild">You can't move a folder into its child</string>
 	<string name="TooltipDragOntoSelf">You can't move a folder into itself</string>
-- 
cgit v1.2.3