summaryrefslogtreecommitdiff
path: root/indra/llui/lldockablefloater.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-01 16:59:52 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-01 16:59:52 +0000
commita8f42e51903bfc35dc56c4dc5f050d1570110634 (patch)
treea010c7f3ed662f666a242d3056a811794d309350 /indra/llui/lldockablefloater.cpp
parentf7f73568b5b3d63ffe589aeabad02dcb2a6c671c (diff)
parent7bcba326b32e1aca678edfb4495d1e2d4d44cb71 (diff)
merge
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);
}