diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-10-17 19:33:09 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-10-17 19:33:09 -0700 |
| commit | ec9260701feaa9ae1453c57f0f70449bb9b60af2 (patch) | |
| tree | 9a6e74ee503c956dc8f13851f3ff0da712861b08 /indra/newview/llinventorybridge.cpp | |
| parent | e56145176875a09dc9e1524a47bcc1259582c896 (diff) | |
| parent | 49ad7fd4b57cec635c557070be02556094e90ff6 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 139713b96e..28c2edbe84 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -577,7 +577,7 @@ void hide_context_entries(LLMenuGL& menu, // descend into split menus: LLMenuItemBranchGL* branchp = dynamic_cast<LLMenuItemBranchGL*>(menu_item); - if ((name == "More") && branchp) + if (NULL != branchp) { hide_context_entries(*branchp->getBranch(), entries_to_show, disabled_entries); } |