diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 14:12:18 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 14:12:18 -0800 |
| commit | 0ac14158bcec40e65fb26d2fea7555ede1e2ca94 (patch) | |
| tree | bacf3b28ac4de7f69da67d7616923dafe92b0d49 /indra/llui/llfloater.cpp | |
| parent | 92cef0426df15c0e661fa795e6b00214f381dd05 (diff) | |
| parent | ab0c9c6754836cb26a520d0a9b2d7bbdd13a5f32 (diff) | |
automated merge from trunk
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rw-r--r-- | indra/llui/llfloater.cpp | 1 |
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); } |