diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-03-18 16:53:41 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-03-18 16:53:41 -0400 |
| commit | 63a0e89fb569216642bd9e023c503741feb9fec2 (patch) | |
| tree | 07a79f2b75ab1c5ac6fb9900ea29aa748d1c26b6 /indra/llui/llmenugl.cpp | |
| parent | 3e2db3d3364e3bb146da9d94b25638bd9fd7de29 (diff) | |
| parent | 615f2cb18e3ade418dbfeca738fad58a6022a9be (diff) | |
merge from hotfix to viewer-2-0 and resolve conflicts
Diffstat (limited to 'indra/llui/llmenugl.cpp')
| -rw-r--r-- | indra/llui/llmenugl.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 0d56c5ed31..fb4a9d032d 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -3455,7 +3455,7 @@ LLView* const LLMenuHolderGL::getVisibleMenu() const for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it) { LLView* viewp = *child_it; - if (viewp->getVisible() && dynamic_cast<LLMenuBarGL*>(viewp) == NULL) + if (viewp->getVisible() && dynamic_cast<LLMenuGL*>(viewp) != NULL) { return viewp; } @@ -3478,8 +3478,7 @@ BOOL LLMenuHolderGL::hideMenus() for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it) { LLView* viewp = *child_it; - // clicks off of menu do not hide menu bar - if (dynamic_cast<LLMenuBarGL*>(viewp) == NULL && viewp->getVisible()) + if (dynamic_cast<LLMenuGL*>(viewp) != NULL && viewp->getVisible()) { viewp->setVisible(FALSE); } |