summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2017-02-24 17:41:39 +0200
committerandreykproductengine <akleshchev@productengine.com>2017-02-24 17:41:39 +0200
commitfd756828a762082c8ae4fa3d69516241ecb1b858 (patch)
tree8444feb1c0251ebbec9a9ce0f0dcb8796cb28e16
parent043d13d5e48b1397de1f84cb19b7d2d85a9757f1 (diff)
MAINT-3509 Fixed Context menu orphaned when Inventory floater is closed by keyboard shortcut
-rw-r--r--indra/llui/llmenugl.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 8425774d46..022f814bbc 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -3342,6 +3342,12 @@ BOOL LLMenuBarGL::handleAcceleratorKey(KEY key, MASK mask)
return TRUE;
}
+ if (result && !getHighlightedItem() && LLMenuGL::sMenuContainer->hasVisibleMenu())
+ {
+ // close menus originating from other menu bars
+ LLMenuGL::sMenuContainer->hideMenus();
+ }
+
return result;
}