summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2012-01-17 11:46:05 -0800
committerLeslie Linden <leslie@lindenlab.com>2012-01-17 11:46:05 -0800
commit944814941d16e7853ff365acc17a16b3a20ac9cb (patch)
tree0503bbd91897345c16462cf71e877be7fb627d3a /indra/newview
parentdc0573be6cff912a20a2eab2ebd6ce61dc687ba6 (diff)
parent3a313469c9be4e71384314ebecb2de7434752c02 (diff)
Latest from viewer-dd
Diffstat (limited to 'indra/newview')
-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 4040701f42..2d5e4938c6 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);
}
}
}