From 363fa450fbd7c91c7bb26c50a7a0eebb276e91e3 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Thu, 10 Oct 2013 04:18:08 -0400
Subject: [PATCH] [LLIMMgr/LLIMPanel Revision] More Miscellaneous Code Cleanup

---
 indra/newview/llimpanel.cpp | 30 +++++++-----------------------
 indra/newview/llimpanel.h   | 10 ++++------
 indra/newview/llimview.cpp  | 11 +++--------
 3 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index b28955255..ec961a52c 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -216,17 +216,10 @@ bool send_start_session_messages(
 			other_participant_id,
 			dialog);
 
-		switch(dialog)
-		{
-		case IM_SESSION_GROUP_START:
-			gMessageSystem->addBinaryDataFast(
-				_PREHASH_BinaryBucket,
-				EMPTY_BINARY_BUCKET,
-				EMPTY_BINARY_BUCKET_SIZE);
-			break;
-		default:
-			break;
-		}
+		gMessageSystem->addBinaryDataFast(
+			_PREHASH_BinaryBucket,
+			EMPTY_BINARY_BUCKET,
+			EMPTY_BINARY_BUCKET_SIZE);
 		gAgent.sendReliableMessage();
 
 		return true;
@@ -470,7 +463,7 @@ BOOL LLFloaterIMPanel::postBuild()
 	{
 		mInputEditor = getChild<LLLineEditor>("chat_editor");
 		mInputEditor->setFocusReceivedCallback( boost::bind(&LLFloaterIMPanel::onInputEditorFocusReceived, this) );
-		mFocusLostSignal = mInputEditor->setFocusLostCallback( boost::bind(&LLFloaterIMPanel::onInputEditorFocusLost, this) );
+		mFocusLostSignal = mInputEditor->setFocusLostCallback(boost::bind(&LLFloaterIMPanel::setTyping, this, false));
 		mInputEditor->setKeystrokeCallback( boost::bind(&LLFloaterIMPanel::onInputEditorKeystroke, this, _1) );
 		mInputEditor->setCommitCallback( boost::bind(&LLFloaterIMPanel::onSendMsg,this) );
 		mInputEditor->setCommitOnFocusLost( FALSE );
@@ -502,11 +495,6 @@ BOOL LLFloaterIMPanel::postBuild()
 		mHistoryEditor->setParseHTML(TRUE);
 		mHistoryEditor->setParseHighlights(TRUE);
 
-		if ( IM_SESSION_GROUP_START == mDialog )
-		{
-			childSetEnabled("profile_btn", FALSE);
-		}
-		
 		sTitleString = getString("title_string");
 		sTypingStartString = getString("typing_start_string");
 		sSessionStartString = getString("session_start_string");
@@ -593,7 +581,8 @@ void LLFloaterIMPanel::draw()
 	// show speakers window when voice first connects
 	if (mShowSpeakersOnConnect && mVoiceChannel->isActive())
 	{
-		childSetVisible("active_speakers_panel", true);
+		if (mSpeakerPanel) mSpeakerPanel->setVisible(true);
+		mShowSpeakersOnConnect = false;
 	}
 	if (LLUICtrl* ctrl = findChild<LLUICtrl>("toggle_active_speakers_btn"))
 		ctrl->setValue(getChildView("active_speakers_panel")->getVisible());
@@ -1045,11 +1034,6 @@ void LLFloaterIMPanel::onInputEditorFocusReceived()
 	mHistoryEditor->setCursorAndScrollToEnd();
 }
 
-void LLFloaterIMPanel::onInputEditorFocusLost()
-{
-	setTyping(FALSE);
-}
-
 void LLFloaterIMPanel::onInputEditorKeystroke(LLLineEditor* caller)
 {
 	// Deleting all text counts as stopping typing.
diff --git a/indra/newview/llimpanel.h b/indra/newview/llimpanel.h
index 2047ed7df..0d80fe6e0 100644
--- a/indra/newview/llimpanel.h
+++ b/indra/newview/llimpanel.h
@@ -37,7 +37,6 @@
 #include "lllogchat.h"
 
 class LLAvatarName;
-class LLButton;
 class LLIMSpeakerMgr;
 class LLIMInfo;
 class LLInventoryCategory;
@@ -99,7 +98,6 @@ public:
 
 	void            onFocusReceived();
 	void			onInputEditorFocusReceived();
-	void			onInputEditorFocusLost();
 	void			onInputEditorKeystroke(LLLineEditor* caller);
 
 	void			onClickHistory();
@@ -245,10 +243,10 @@ private:
 
 
 	CachedUICtrl<LLUICtrl> mVolumeSlider;
-	CachedUICtrl<LLButton> mEndCallBtn;
-	CachedUICtrl<LLButton> mStartCallBtn;
-	CachedUICtrl<LLButton> mSendBtn;
-	CachedUICtrl<LLButton> mMuteBtn;
+	CachedUICtrl<LLUICtrl> mEndCallBtn;
+	CachedUICtrl<LLUICtrl> mStartCallBtn;
+	CachedUICtrl<LLUICtrl> mSendBtn;
+	CachedUICtrl<LLUICtrl> mMuteBtn;
 };
 
 
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 9fcebdd07..824f207b1 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -427,20 +427,19 @@ void LLIMMgr::addMessage(
 		return;
 	}
 
-	LLFloaterIMPanel* floater;
 	LLUUID new_session_id = session_id;
 	if (new_session_id.isNull())
 	{
 		//no session ID...compute new one
 		new_session_id = computeSessionID(dialog, other_participant_id);
 	}
-	floater = findFloaterBySession(new_session_id);
+	LLFloaterIMPanel* floater = findFloaterBySession(new_session_id);
 	if (!floater)
 	{
 		floater = findFloaterBySession(other_participant_id);
 		if (floater)
 		{
-			llinfos << "found the IM session " << session_id 
+			llinfos << "found the IM session " << new_session_id
 				<< " by participant " << other_participant_id << llendl;
 		}
 	}
@@ -454,11 +453,7 @@ void LLIMMgr::addMessage(
 		if (getIgnoreGroup(session_id) && gAgent.isInGroup(session_id))
 			return;
 
-		std::string name = from;
-		if(!session_name.empty() && session_name.size()>1)
-		{
-			name = session_name;
-		}
+		std::string name = (session_name.size() > 1) ? session_name : from;
 
 		floater = createFloater(new_session_id, other_participant_id, name, dialog);