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

DD-107, DD-111 : Add a tooltip to indicate why you can't move an active listing

meow-7.2.2
Merov Linden 2014-06-10 20:58:59 -07:00
parent ae2f24d0c1
commit dfe8416ca6
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llinventorybridge.cpp
View File

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

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

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