summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2010-07-28 18:27:09 +0300
committerAlexei Arabadji <aarabadji@productengine.com>2010-07-28 18:27:09 +0300
commitfc84ffcbec21d63e1666e93c9453149acf2f9832 (patch)
treef84a0a1f946f92d6e365c6a72378d40efe291991 /indra/newview
parent34e7382665a3deaaed7306572fc1ea19a2e77765 (diff)
EXT-7015 ADDITIONAL FIX Updated condition of hiding wear related context menu entries from "hide if all can't be worn" to "hide if any can't be worn".
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/813/ --HG-- branch : product-engine
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llwearableitemslist.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp
index 8ea731cf10..34f6fbebd6 100644
--- a/indra/newview/llwearableitemslist.cpp
+++ b/indra/newview/llwearableitemslist.cpp
@@ -769,7 +769,7 @@ void LLWearableItemsList::ContextMenu::updateItemsVisibility(LLContextMenu* menu
U32 n_links = 0; // number of links among the selected items
U32 n_editable = 0; // number of editable items among the selected ones
- bool can_be_worn = false;
+ bool can_be_worn = true;
for (uuid_vec_t::const_iterator it = ids.begin(); it != ids.end(); ++it)
{
@@ -807,8 +807,7 @@ void LLWearableItemsList::ContextMenu::updateItemsVisibility(LLContextMenu* menu
++n_already_worn;
}
- // if any in trash
- if (!can_be_worn)
+ if (can_be_worn)
{
can_be_worn = get_can_item_be_worn(item->getLinkedUUID());
}