CHUI-380: (In progress) Refactoring needed to fix focusing issues when selecting an existing conversation item. This commit resolves re-introducing bug CHUI-289. Will code review and cleanup code in next commit.

1 files changed, 0 insertions, 11 deletions

diff --git a/indra/newview/llimconversation.cpp b/indra/newview/llimconversation.cpp
index 2027f79eea..bd2a2419a8 100644
--- a/indra/newview/llimconversation.cpp
+++ b/indra/newview/llimconversation.cpp
@@ -54,7 +54,6 @@ LLIMConversation::LLIMConversation(const LLSD& session_id)
   , mInputEditor(NULL)
   , mInputEditorTopPad(0)
   , mRefreshTimer(new LLTimer())
-  , mHasFocus(false)
 {
 	mSession = LLIMModel::getInstance()->findIMSession(mSessionID);
 
@@ -216,21 +215,11 @@ void LLIMConversation::onFocusReceived()
 	}
 
 	LLTransientDockableFloater::onFocusReceived();
-
-    mHadFocus = mHasFocus;
-    mHasFocus = true;
-
-	if (! mHadFocus)
-	{
-	//    LLIMFloaterContainer* container = LLIMFloaterContainer::getInstance();
-	//    container->setConvItemSelect(mSessionID);
-	}
 }
 
 void LLIMConversation::onFocusLost()
 {
 	setBackgroundOpaque(false);
-	mHasFocus = false;
 	LLTransientDockableFloater::onFocusLost();
 }