From 4ad7647e83ed744c74507b97fdb3d10728d83057 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Sat, 2 Aug 2014 14:58:26 -0700 Subject: DD-161 : Make marketplace listings root folder not movable and add a special tooltip to that effect --- indra/newview/llinventorybridge.cpp | 5 +++++ indra/newview/skins/default/xui/en/strings.xml | 1 + 2 files changed, 6 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 5c5ad1fa30..0b6fe3dfbc 100755 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2354,6 +2354,11 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat, BOOL is_movable = TRUE; + if (is_movable && (marketplacelistings_id == cat_id)) + { + is_movable = FALSE; + tooltip_msg = LLTrans::getString("TooltipOutboxCannotMoveRoot"); + } 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), diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 21c82b6290..3cf8ffae26 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -246,6 +246,7 @@ Please try logging in again in a minute. Items count exceeds [AMOUNT] You can't move an active listed listing You can't drop items on filtered tabs root + You can't move the marketplace listings root folder You can't move a folder into its child You can't move a folder into itself -- cgit v1.2.3