diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-23 16:52:21 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-23 16:52:21 +0200 |
| commit | 7a0e2dc59b9e2de48e02cc441a87cf78cb5317c4 (patch) | |
| tree | 71a373c2d37b2830595527efa4474355600f0a9a | |
| parent | 9d08360f73fdb1080f76c4034cbac5c37ee8b75b (diff) | |
| parent | 6c48bb9f2df743eb85a91da040d33f0816721aa3 (diff) | |
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
| -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); + } } } |