diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-23 18:14:39 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-23 18:14:39 +0200 |
| commit | 568adbcdb0d9ab4151b1aeb54181c20a15e5f798 (patch) | |
| tree | 641bfc6219a62c0a3aede37d1a19b18b486c4785 /indra/llui/llfloater.cpp | |
| parent | dd20b16ed084b936d2e6c11a48aa34d83828aab5 (diff) | |
| parent | d741d040bc0f06f573b4a2507fba2b245191c36d (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rw-r--r-- | indra/llui/llfloater.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index d7a692ec9b..845203b420 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -2148,6 +2148,11 @@ void LLFloaterView::bringToFront(LLFloater* child, BOOL give_focus) if (give_focus && !gFocusMgr.childHasKeyboardFocus(child)) { child->setFocus(TRUE); + // floater did not take focus, so relinquish focus to world + if (!child->hasFocus()) + { + gFocusMgr.setKeyboardFocus(NULL); + } } } |