diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-06 12:22:06 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-06 12:22:06 -0800 |
| commit | a91c2d889aad577fb22dc8f11e0dd168d71ec09d (patch) | |
| tree | 6f8234a6fcac9457c685495c2bdca6bf60a8f2df /indra/llui/llfloater.cpp | |
| parent | f2524568ea1895df58b7735fe959c772d558160d (diff) | |
| parent | bf6d1670756ba96abde570e7dbbf94c62c71ca5b (diff) | |
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
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(); |