MAINT-1094 FIXED after triggering a menu with control-F10, clicking in-world should move keyboard focus in-world

master
Mnikolenko Productengine 2017-05-22 16:45:33 +03:00
parent c102bcf0ad
commit f34bee5966
1 changed files with 2 additions and 1 deletions

View File

@ -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)
{