diff options
| author | callum <none@none> | 2009-12-28 13:45:57 -0800 |
|---|---|---|
| committer | callum <none@none> | 2009-12-28 13:45:57 -0800 |
| commit | 3519435bbfeec4c838d5ffbe008d0ac7bbc085a8 (patch) | |
| tree | 5d590d84a1fa6c8414adba0732a83a67a440dd37 /indra/llui/llfloater.cpp | |
| parent | dd1fb1568e85a8e3622372cae21bcd3205051718 (diff) | |
| parent | 6008bf61b2d0475a274ad2b851b61e69496b5bf8 (diff) | |
Merge with (specific revision) and head
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); + } } } |