summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-07-12 17:32:03 -0400
committerLoren Shih <seraph@lindenlab.com>2010-07-12 17:32:03 -0400
commitc5356935354013530432cfb07556902a039020a9 (patch)
tree36d973537702feac9cc3e3d211ecfa607c5adc5b /indra
parentd3f114d6901877bb79ae9719f59d681fa6a9d494 (diff)
EXT-8333 FIXED 'Add more': 'Wear' item remains enabled in context menu of worn object
Simple logic fix so that worn objects son't have add/wear option.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llwearableitemslist.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp
index 60ebb9416e..35abbc0c4d 100644
--- a/indra/newview/llwearableitemslist.cpp
+++ b/indra/newview/llwearableitemslist.cpp
@@ -765,8 +765,8 @@ void LLWearableItemsList::ContextMenu::updateItemsVisibility(LLContextMenu* menu
bool standalone = mParent ? mParent->isStandalone() : false;
// *TODO: eliminate multiple traversals over the menu items
- setMenuItemVisible(menu, "wear_wear", n_already_worn == 0);
- setMenuItemEnabled(menu, "wear_wear", n_already_worn == 0);
+ setMenuItemVisible(menu, "wear_wear", n_already_worn == 0 && n_worn == 0);
+ setMenuItemEnabled(menu, "wear_wear", n_already_worn == 0 && n_worn == 0);
setMenuItemVisible(menu, "wear_add", mask == MASK_CLOTHING && n_worn == 0 && n_already_worn != 0);
setMenuItemEnabled(menu, "wear_add", n_items == 1 && canAddWearable(ids.front()) && n_already_worn != 0);
setMenuItemVisible(menu, "wear_replace", n_worn == 0 && n_already_worn != 0);