summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-08-26 12:37:43 -0400
committerLoren Shih <seraph@lindenlab.com>2010-08-26 12:37:43 -0400
commit63c504e4b08d28d31f7e8e2b5cda977c7b81215d (patch)
treef9db859f673d96da8b124ed0fa0acb4ade67b0f4 /indra
parent635128f353758e59c1ae158b2f01d291b0cea30f (diff)
Fix for bad merge error.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llwearableitemslist.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp
index 858c86b13d..4373eec02a 100644
--- a/indra/newview/llwearableitemslist.cpp
+++ b/indra/newview/llwearableitemslist.cpp
@@ -889,7 +889,7 @@ void LLWearableItemsList::ContextMenu::updateItemsVisibility(LLContextMenu* menu
setMenuItemVisible(menu, "edit", !standalone && mask & (MASK_CLOTHING|MASK_BODYPART) && n_worn == n_items && n_worn == 1);
setMenuItemEnabled(menu, "edit", n_editable == 1 && n_worn == 1 && n_items == 1);
setMenuItemVisible(menu, "create_new", mask & (MASK_CLOTHING|MASK_BODYPART) && n_items == 1);
- setMenuItemEnabled(menu, "create_new", canAddWearable(ids.front()));
+ setMenuItemEnabled(menu, "create_new", canAddWearables(ids));
setMenuItemVisible(menu, "show_original", !standalone);
setMenuItemEnabled(menu, "show_original", n_items == 1 && n_links == n_items);
setMenuItemVisible(menu, "take_off", mask == MASK_CLOTHING && n_worn == n_items);