From fd756828a762082c8ae4fa3d69516241ecb1b858 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Fri, 24 Feb 2017 17:41:39 +0200
Subject: MAINT-3509 Fixed Context menu orphaned when Inventory floater is
closed by keyboard shortcut
---
indra/llui/llmenugl.cpp | 6 ++++++
1 file changed, 6 insertions(+)
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;
}
--
cgit v1.2.3