summaryrefslogtreecommitdiff
path: root/indra/llui/lldockablefloater.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2009-11-17 09:28:26 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2009-11-17 09:28:26 +0000
commita402f4894d72209f9ac9bc9d7962c28b3c26bb18 (patch)
tree1db4f4a35008b6f4281e6275b7a4beb679d285d6 /indra/llui/lldockablefloater.cpp
parentb42b421d25f3b3a7ea4f571388acb64f98e1f51d (diff)
parentccc72757ef23fa7ffba066e5bdaf05e3f8a95cca (diff)
merge.
Diffstat (limited to 'indra/llui/lldockablefloater.cpp')
-rw-r--r--indra/llui/lldockablefloater.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp
index f56cb2eee7..c3dd4ae647 100644
--- a/indra/llui/lldockablefloater.cpp
+++ b/indra/llui/lldockablefloater.cpp
@@ -127,6 +127,10 @@ void LLDockableFloater::setVisible(BOOL visible)
mDockControl.get()->repositionDockable();
}
+ if (visible)
+ {
+ LLFloater::setFrontmost(TRUE);
+ }
LLFloater::setVisible(visible);
}