diff options
author | Richard Nelson <none@none> | 2010-03-10 18:22:26 -0800 |
---|---|---|
committer | Richard Nelson <none@none> | 2010-03-10 18:22:26 -0800 |
commit | dcbf0ab31ba256791e58dfc2aa3bf61609a8a797 (patch) | |
tree | 3d3559b54bc597eba53d5b0b6c5d6cbee274d7af /indra/llui/llmenugl.cpp | |
parent | 347585cf975afac59ec6b9960e093acd015627f5 (diff) | |
parent | 1e5fe95b1d2d4912a3c9d84e2c32ff141f0dc4d9 (diff) |
merge
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); } |