diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-03-16 12:33:25 -0700 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-16 12:33:25 -0700 |
commit | 60c4621500e478d66a8bdc3a1c80573be2860fee (patch) | |
tree | fa10b52caf3a54e03502058cd52d77952370cb34 /indra/newview/llgrouplist.cpp | |
parent | 2e525711cd08d5f1dce991d1b6595a8dd41c9e3b (diff) | |
parent | ba414d500ca8cb88da530c89ba373c95195ce633 (diff) |
Automated merge from viewer/viewer-2-0
Diffstat (limited to 'indra/newview/llgrouplist.cpp')
-rw-r--r-- | indra/newview/llgrouplist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llgrouplist.cpp b/indra/newview/llgrouplist.cpp index ba43e16f32..03a47b5983 100644 --- a/indra/newview/llgrouplist.cpp +++ b/indra/newview/llgrouplist.cpp @@ -127,7 +127,7 @@ BOOL LLGroupList::handleRightMouseDown(S32 x, S32 y, MASK mask) BOOL handled = LLUICtrl::handleRightMouseDown(x, y, mask); LLMenuGL* context_menu = (LLMenuGL*)mContextMenuHandle.get(); - if (context_menu) + if (context_menu && size() > 0) { context_menu->buildDrawLabels(); context_menu->updateParent(LLMenuGL::sMenuContainer); |