summaryrefslogtreecommitdiff
path: root/indra/newview/llimfloater.cpp
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2010-02-16 12:47:54 +0200
committerAlexei Arabadji <aarabadji@productengine.com>2010-02-16 12:47:54 +0200
commitf808bafa663b5b855cbb26af552bbca1caa4c026 (patch)
tree8b0597c88e430433c28565b60b6c7e8cd874d5e9 /indra/newview/llimfloater.cpp
parent481e26ae2db0415226a04eec3b3f05f9a246081d (diff)
fixed major EXT-5387 “Private IM Window Steals Focus from Nearby Chat”,
prevented focus stealing when IM opened in multitab mode; --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llimfloater.cpp')
-rw-r--r--indra/newview/llimfloater.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index 8b2c5b039f..847695577a 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -497,7 +497,11 @@ void LLIMFloater::setVisible(BOOL visible)
{
//only if floater was construced and initialized from xml
updateMessages();
- mInputEditor->setFocus(TRUE);
+ //prevent steal focus when IM opened in multitab mode
+ if (!isChatMultiTab())
+ {
+ mInputEditor->setFocus(TRUE);
+ }
}
if(!visible)