diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-08-28 14:03:26 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-08-28 14:03:26 +0100 |
| commit | a254ca8b442e0a17e7048b792fbba48c8db592ee (patch) | |
| tree | 44d591046709d7b8331ab3e8657019326b14cdfe /indra/llui/llmenugl.cpp | |
| parent | e27efe894740c0c3c959115524ac49db9615262a (diff) | |
| parent | 08cbed55ef5689fcc5a02dfb3b9afde15487036e (diff) | |
merge
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) { |