diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2012-01-20 13:41:43 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2012-01-20 13:41:43 -0800 |
| commit | a73013f7081db15aae93cc82feb895139b1847db (patch) | |
| tree | ca8b74b106f9d579e31eb63b84446db450f4ae2e | |
| parent | f42a8a768c3028e81a48b19ac75943f15bfedf1e (diff) | |
EXP-1799 FIX -- Replace and Add to Outfit options appear as grayed out in Inventory
* Modified build context menu code to not disable items that are invisible so
secondary background fetch can coalesce menu options with proper state.
* Removed "Move to Merchant Outbox" context menu option.
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 17 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_inventory.xml | 8 |
2 files changed, 5 insertions, 20 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 12322b2921..97e61f4c99 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -519,7 +519,6 @@ void hide_context_entries(LLMenuGL& menu, { menu_item->setVisible(FALSE); } - menu_item->setEnabled(FALSE); } else { @@ -528,14 +527,10 @@ void hide_context_entries(LLMenuGL& menu, // so that some other UI element from multi-select doesn't later set this invisible. menu_item->pushVisible(TRUE); - BOOL enabled = menu_item->getEnabled(); - for (itor2 = disabled_entries.begin(); itor2 != disabled_entries.end(); ++itor2) + bool enabled = (menu_item->getEnabled() == TRUE); + for (itor2 = disabled_entries.begin(); enabled && (itor2 != disabled_entries.end()); ++itor2) { - if (*itor2 == name) - { - enabled = FALSE; - break; - } + enabled &= (*itor2 != name); } menu_item->setEnabled(enabled); @@ -613,12 +608,10 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id, copyable = inv_item->getPermissions().allowCopyBy(gAgent.getID()); } - const std::string merchant_action = ((copyable == true) ? "Merchant Copy" : "Merchant Move"); - items.push_back(merchant_action); - + items.push_back(std::string("Merchant Copy")); if (!canListOnMarketplaceNow()) { - disabled_items.push_back(merchant_action); + disabled_items.push_back(std::string("Merchant Copy")); } } } diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 31dcdfffbb..ef4a1bc061 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -686,14 +686,6 @@ parameter="copy_to_outbox" /> </menu_item_call> <menu_item_call - label="Move to Merchant Outbox" - layout="topleft" - name="Merchant Move"> - <menu_item_call.on_click - function="Inventory.DoToSelected" - parameter="move_to_outbox" /> - </menu_item_call> - <menu_item_call label="Send to Marketplace" layout="topleft" name="Marketplace Send"> |