diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-01-21 15:58:35 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-01-21 15:58:35 -0500 |
| commit | aa68e0fd302bd91b7387bafa1ba19412ec98af4e (patch) | |
| tree | edc4a9a81111195ec275cf6d008427f6099e907e /indra/llui | |
| parent | ccc90257e7622bcf35454e8d4a0780f020ee6c39 (diff) | |
| parent | 24c8ed10470b1fe6cc58ba5b2e07a34a183cb1c6 (diff) | |
merge
Diffstat (limited to 'indra/llui')
| -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); } |