diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-10-12 16:24:05 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-10-12 16:24:05 -0400 |
| commit | a16a6034c25c5e78331ef1bd13485df8759456e5 (patch) | |
| tree | c1d1ef6f387daa81039b27a2cdb435a31c25b5d7 /indra/llui/lldockablefloater.cpp | |
| parent | 5b58bfb937f7f996c7f1b97f15b1c837aa23a463 (diff) | |
| parent | 4312629e7c5749b86add9d42e6e550602f34dbf5 (diff) | |
merge
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()); } |