summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-01-21 09:25:44 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2010-01-21 09:25:44 -0800
commit2c0418dfe0a3e903210516a70fd947870c340bf8 (patch)
tree9fc4c80cda74d89038f433e4e4c7f331ed702e84 /indra/llui
parent435dcdb3e307f70b5d0be801a98fb05cb1c87fcf (diff)
parent43c355e39891db7047652d56fd5bf53bb69659b7 (diff)
PE merge.
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llfloater.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 4f519afa06..79d8f90fec 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -1360,6 +1360,7 @@ void LLFloater::bringToFront( S32 x, S32 y )
// virtual
void LLFloater::setVisibleAndFrontmost(BOOL take_focus)
{
+ gFocusMgr.setTopCtrl(NULL);
setVisible(TRUE);
setFrontmost(take_focus);
}