diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-15 10:50:28 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-15 10:50:28 +0100 |
| commit | 6690cd65c4e9bf6680f4f0b9ea2d38a80eb3d268 (patch) | |
| tree | 41c7d5fbcbd875152db63e4fa1137e7d8dd67588 /indra/newview/llimfloater.cpp | |
| parent | 5c29fa93838b4904fb236190bfe621cdfd33503c (diff) | |
| parent | 9f0f610682e0bcceb88eaddcb7a02acfcf3d05ce (diff) | |
merge from viewer-trunk
Diffstat (limited to 'indra/newview/llimfloater.cpp')
| -rw-r--r-- | indra/newview/llimfloater.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 3ec8d11fb0..19dbc564d1 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -499,8 +499,8 @@ void LLIMFloater::setVisible(BOOL visible) { //only if floater was construced and initialized from xml updateMessages(); - //prevent steal focus when IM opened in multitab mode - if (!isChatMultiTab()) + //prevent stealing focus when opening a background IM tab (EXT-5387, checking focus for EXT-6781) + if (!isChatMultiTab() || hasFocus()) { mInputEditor->setFocus(TRUE); } |