diff options
| author | Richard Nelson <none@none> | 2010-03-10 18:20:18 -0800 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-03-10 18:20:18 -0800 |
| commit | 1e5fe95b1d2d4912a3c9d84e2c32ff141f0dc4d9 (patch) | |
| tree | 633109cc818c4e9f7ab1daa93089fc12d623fe6d /indra/llui/llmenugl.cpp | |
| parent | 34d1d34ca100fd137c2a85f0e0f330730fb70aba (diff) | |
EXT-6295 - Cannot log in with new account, TOS dialog does not load
reviewed by Mani
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); } |