summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-03-04 16:06:58 +0200
committerMike Antipov <mantipov@productengine.com>2010-03-04 16:06:58 +0200
commitdea244dcead7ed362eae330794c9fcd5a389394b (patch)
tree0b03f4f0cca8aebc7a001bc8235f52ba6b136654
parent4e518758d78b4b60d1b123eafc7df5ff4b8c44c6 (diff)
Backed out changeset: 07f21c92896f
reverted fix for (EXT-3852 Tabs in Tabbed Instant Messaging do not auto focus the text field when clicked) Previously implemented solution conflicts with test case in EXT-5387. --HG-- branch : product-engine
-rw-r--r--indra/newview/llimfloater.cpp14
1 files changed, 0 insertions, 14 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index 9bd5a8d5aa..259f629bdd 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -120,12 +120,6 @@ void LLIMFloater::onFocusLost()
void LLIMFloater::onFocusReceived()
{
LLIMModel::getInstance()->setActiveSessionID(mSessionID);
-
- // return focus to the input field when active tab in the multitab container is clicked.
- if (isChatMultiTab() && mInputEditor)
- {
- mInputEditor->setFocus(TRUE);
- }
}
// virtual
@@ -624,14 +618,6 @@ void LLIMFloater::onInputEditorFocusReceived( LLFocusableElement* caller, void*
//in disconnected state IM input editor should be disabled
self->mInputEditor->setEnabled(!gDisconnected);
}
-
- // when IM Floater is a part of the multitab container LLTabContainer set focus to the first
- // child on tab button's mouse up. This leads input field lost focus. See EXT-3852.
- if (isChatMultiTab())
- {
- // So, let capture mouse tp prevent LLTabContainer set focus on the panel's first child.
- gFocusMgr.setMouseCapture(self->mInputEditor);
- }
}
// static