diff options
| author | Aura Linden <aura@lindenlab.com> | 2015-10-13 16:44:20 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2015-10-13 16:44:20 -0700 |
| commit | 2f6166a5a4f8d5be679cef0699142c4ef061fb55 (patch) | |
| tree | f45efe7e4c55c37dc097f15f8e0f445d86bfe972 /indra/llui/lldockablefloater.cpp | |
| parent | 8729f5d23a52263e55df5574c672c87d00b563bd (diff) | |
| parent | a16a6034c25c5e78331ef1bd13485df8759456e5 (diff) | |
Pulled merge from llinternal/bento-box.
Diffstat (limited to 'indra/llui/lldockablefloater.cpp')
| -rwxr-xr-x | indra/llui/lldockablefloater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp index 3396213f1c..c937d190c6 100755 --- a/indra/llui/lldockablefloater.cpp +++ b/indra/llui/lldockablefloater.cpp @@ -153,7 +153,7 @@ void LLDockableFloater::setVisible(BOOL visible) mDockControl.get()->repositionDockable(); } - if (visible) + if (visible && !isMinimized()) { LLFloater::setFrontmost(getAutoFocus()); } |