diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2017-02-28 15:52:47 +0000 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2017-02-28 15:52:47 +0000 |
| commit | edade660ecfeb8b5cc8eb505e6c4f79f8caa96d7 (patch) | |
| tree | 5a06eb47894f48ab8dbbcb5a91dbf0aae8eed9c2 | |
| parent | ba99caa574d1e346aecf2f0fe39d46d340f8afbf (diff) | |
| parent | fd756828a762082c8ae4fa3d69516241ecb1b858 (diff) | |
Merged in MAINT-3509
| -rw-r--r-- | indra/llui/llmenugl.cpp | 6 |
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; } |