summaryrefslogtreecommitdiff
path: root/indra/llui/lldockablefloater.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-03 16:08:44 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-03 16:08:44 +0000
commita171848fd4fed2fe915bcb42de96359112cf95e1 (patch)
tree5f4d85f4469f2d737864b3a07b367fa81040f3a3 /indra/llui/lldockablefloater.cpp
parentcc5920bed7790db49a062fb98ce54191f06ed98c (diff)
parentfc70ca5403acdd99b2235dbf4e513a4dd806c850 (diff)
merge from viewer2.
Diffstat (limited to 'indra/llui/lldockablefloater.cpp')
-rw-r--r--indra/llui/lldockablefloater.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp
index 74438b184a..57baf28dab 100644
--- a/indra/llui/lldockablefloater.cpp
+++ b/indra/llui/lldockablefloater.cpp
@@ -146,7 +146,7 @@ void LLDockableFloater::setVisible(BOOL visible)
if (visible)
{
- LLFloater::setFrontmost(TRUE);
+ LLFloater::setFrontmost(getAutoFocus());
}
LLFloater::setVisible(visible);
}