summaryrefslogtreecommitdiff
path: root/indra/llui/lldockablefloater.cpp
diff options
context:
space:
mode:
authorYchebotarev ProductEngine <ychebotarev@productengine.com>2010-02-02 11:15:56 +0200
committerYchebotarev ProductEngine <ychebotarev@productengine.com>2010-02-02 11:15:56 +0200
commit7f83000ea13bac5b4cccb9a6f12e764ac8d69b2a (patch)
tree9ca8e77a8b67f85a959a867ea9f400c7c11746a2 /indra/llui/lldockablefloater.cpp
parentff4b80f27126adfc11e6facfa53aa1fafd3d19ec (diff)
parenta359db96eb0273bf67fe48bae2665ea65831cf67 (diff)
merge
--HG-- branch : product-engine
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);
}