diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-23 16:51:21 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-23 16:51:21 +0200 |
| commit | 6c48bb9f2df743eb85a91da040d33f0816721aa3 (patch) | |
| tree | 48607a6a03d32537da9fee430d44358508d8fbba /indra | |
| parent | cf18b668ce65cade3b0f2257f4005098b81b9e07 (diff) | |
fixed EXT-3425 “Undocked floaters focus issue”,
made focus be passed to game area in case floater can't hold focus;
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -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); + } } } |