diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-08-02 14:58:26 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-08-02 14:58:26 -0700 |
| commit | 4ad7647e83ed744c74507b97fdb3d10728d83057 (patch) | |
| tree | f935650a37f75f5538f15d7e15aa9ea3c920f07e /indra | |
| parent | 02978ddea555da1cc33403bba94ada5f54318c16 (diff) | |
DD-161 : Make marketplace listings root folder not movable and add a special tooltip to that effect
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llinventorybridge.cpp | 5 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/strings.xml | 1 |
2 files changed, 6 insertions, 0 deletions
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.</string> <string name="TooltipOutboxTooManyObjects">Items count exceeds [AMOUNT]</string> <string name="TooltipOutboxDragActive">You can't move an active listed listing</string> <string name="TooltipOutboxCannotDropOnRoot">You can't drop items on filtered tabs root</string> + <string name="TooltipOutboxCannotMoveRoot">You can't move the marketplace listings root folder</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> |