summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2012-01-17 11:44:40 -0800
committerLeslie Linden <leslie@lindenlab.com>2012-01-17 11:44:40 -0800
commit3a313469c9be4e71384314ebecb2de7434752c02 (patch)
tree2dd6d8af7cac27e6e63e2c893c26167480295101 /indra
parent577479a3e53ef152da191e3a004aeb34f0815658 (diff)
EXP-1799 FIX -- Replace and Add to Outfit options appear as grayed out in Inventory
* Updated context menu code to enable visible items that aren't explicitly disabled.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llinventorybridge.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 1a4fd17d61..c97d756a31 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -529,14 +529,17 @@ 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 = TRUE;
for (itor2 = disabled_entries.begin(); itor2 != disabled_entries.end(); ++itor2)
{
if (*itor2 == name)
{
- menu_item->setEnabled(FALSE);
+ enabled = FALSE;
break;
}
}
+
+ menu_item->setEnabled(enabled);
}
}
}