diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-08-16 15:43:58 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-08-16 15:43:58 -0400 |
| commit | 01e0b78c595e346bef4e771f9580006dd895367c (patch) | |
| tree | 90160c9edb07baa4fcfd022082608f96b1bfdc06 /indra/llui/llmenugl.cpp | |
| parent | 2368c44a8e2b031e5a8ac199923a016915cfe96a (diff) | |
| parent | cf865bb5962a85e2da3414468d6a99ecb5423f97 (diff) | |
merge changes for DRTVWR-439
Diffstat (limited to 'indra/llui/llmenugl.cpp')
| -rw-r--r-- | indra/llui/llmenugl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 022f814bbc..0d42f726fa 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -3331,6 +3331,7 @@ BOOL LLMenuBarGL::handleAcceleratorKey(KEY key, MASK mask) if (getHighlightedItem()) { clearHoverItem(); + LLMenuGL::setKeyboardMode(FALSE); } else { @@ -3777,10 +3778,10 @@ BOOL LLMenuHolderGL::hideMenus() { return FALSE; } + LLMenuGL::setKeyboardMode(FALSE); BOOL menu_visible = hasVisibleMenu(); if (menu_visible) { - LLMenuGL::setKeyboardMode(FALSE); // clicked off of menu, hide them all for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it) { |