livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DD-161 : Make marketplace listings root folder not movable and add a special tooltip to that effect

meow-7.2.2
Merov Linden 2014-08-02 14:58:26 -07:00
parent 02978ddea5
commit 4ad7647e83
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llinventorybridge.cpp
View File

@ -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),

1
indra/newview/skins/default/xui/en/strings.xml
View File

@ -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>