diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-04-16 14:51:15 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-04-16 14:51:15 -0700 |
| commit | 663d8f7870c2858956aea8ab20129fd084a96dc8 (patch) | |
| tree | 5ea7eaf40a018fbabaee165cc511998c5390f181 /indra/newview/llimfloater.cpp | |
| parent | ba057d34cdc8fb91093aadaaad22618b6371cd0f (diff) | |
| parent | 8cb7af4f73c0a703b5842a708e94d80aea26b6db (diff) | |
Merge
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); } |