diff options
| -rw-r--r-- | indra/newview/llimfloater.cpp | 13 | ||||
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 12 |
2 files changed, 4 insertions, 21 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 990b9c45f9..a1ed1e0b01 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -723,20 +723,11 @@ void LLIMFloater::setFocus(BOOL focusFlag) { LLTransientDockableFloater::setFocus(focusFlag); - BOOL is_minimized = focusFlag && isChatMultiTab() - ? LLIMFloaterContainer::getInstance()->isMinimized() - : !focusFlag; - //Redirect focus to input editor - if (!is_minimized && mChatHistory && mInputEditor) + if (focusFlag) { - //only if floater was construced and initialized from xml updateMessages(); - //prevent stealing focus when opening a background IM tab (EXT-5387, checking focus for EXT-6781) - if (!isChatMultiTab() || hasFocus()) - { - mInputEditor->setFocus(TRUE); - } + mInputEditor->setFocus(TRUE); } } diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index e0778afd86..a0ddc9b52b 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -275,18 +275,10 @@ void LLNearbyChat::setFocus(BOOL focusFlag) { LLTransientDockableFloater::setFocus(focusFlag); - BOOL is_minimized = focusFlag && isChatMultiTab() - ? LLIMFloaterContainer::getInstance()->isMinimized() - : !focusFlag; - //Redirect focus to input editor - if (!is_minimized && mChatHistory && mInputEditor) + if (focusFlag) { - //prevent stealing focus when opening a background IM tab (EXT-5387, checking focus for EXT-6781) - if (!isChatMultiTab() || hasFocus()) - { - mInputEditor->setFocus(TRUE); - } + mInputEditor->setFocus(TRUE); } } |