diff options
| author | Rider Linden <rider@lindenlab.com> | 2017-05-01 09:04:14 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2017-05-01 09:04:14 -0700 |
| commit | bb0e2e6b957f9abf3ddc819d20aea3936d500467 (patch) | |
| tree | bc6ed362332740ea6e5829966d1afd618f1b60fb /indra/llui/llmenugl.cpp | |
| parent | dca8d3b5f569ed0b074a58cd054ea3065a15a717 (diff) | |
| parent | f62b5503285d828813d87779fa0658ee5f122ac5 (diff) | |
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/llui/llmenugl.cpp')
| -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; } |