merge from viewer-2-0

1 files changed, 0 insertions, 15 deletions

diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index 8cdc50eb70..77eaebb0bc 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -127,12 +127,6 @@ 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);
-	}
-
 	LLBottomTray::getInstance()->getChicletPanel()->setChicletToggleState(mSessionID, true);
 }
 
@@ -682,15 +676,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, clear control captured mouse to prevent LLTabContainer set focus on the panel's first child.
-		// do not pass self->mInputEditor, this leads to have "Edit Text" mouse pointer wherever it is.
-		gFocusMgr.setMouseCapture(NULL);
-	}
 }
 
 // static