diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-05-22 16:45:33 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-05-22 16:45:33 +0300 |
| commit | f34bee596641318d7480acf624e04af7d8bc8bfc (patch) | |
| tree | ec380cc90a3fdd6c813cf745ca387cf6d9733b5f /indra/llui | |
| parent | c102bcf0adc45f855f103831542b019ad60702e7 (diff) | |
MAINT-1094 FIXED after triggering a menu with control-F10, clicking in-world should move keyboard focus in-world
Diffstat (limited to 'indra/llui')
| -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) { |