diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-08-16 11:00:55 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-08-16 11:00:55 -0400 |
| commit | 79bf2c492950c630879c708f9e7d18b597471e8a (patch) | |
| tree | 92a69e35df6798c20082877bef2bc76a9b9b35f2 /indra/llui/llfloater.cpp | |
| parent | 0c903609d47fbff0b2436c8873b6abb2ce2d5e3c (diff) | |
| parent | e35f3b7db4803c287e95fb5aaa563e8432e71349 (diff) | |
merge changes for storm-1879
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rw-r--r-- | indra/llui/llfloater.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 8ca1e685a9..90251ac7c6 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -748,6 +748,10 @@ void LLFloater::closeFloater(bool app_quitting) dependee->setFocus(TRUE); } } + + // STORM-1879: since this floater has focus, treat the closeFloater- call + // like a click on the close-button, and close gear- and contextmenus + LLMenuGL::sMenuContainer->hideMenus(); } dirtyRect(); |