From 9b72178ca9920e06d89c0694a1efae66b4d588cf Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 4 Sep 2015 20:34:30 +0200
Subject: [PATCH] Clean up includes in FSFloaterIMContainer

---
 indra/newview/fsfloaterimcontainer.cpp | 20 ++++++++------------
 indra/newview/fsfloaterimcontainer.h   |  8 +-------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/indra/newview/fsfloaterimcontainer.cpp b/indra/newview/fsfloaterimcontainer.cpp
index fb64cb5aec..275775485a 100644
--- a/indra/newview/fsfloaterimcontainer.cpp
+++ b/indra/newview/fsfloaterimcontainer.cpp
@@ -30,21 +30,15 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "fsfloaterimcontainer.h"
-#include "llfloaterreg.h"
-#include "llimview.h"
-#include "llavatariconctrl.h"
-#include "llgroupiconctrl.h"
-#include "llagent.h"
-#include "lltransientfloatermgr.h"
-#include "fsfloaternearbychat.h"
+
 #include "fsfloatercontacts.h"
-#include "llfloater.h"
-#include "llviewercontrol.h"
 #include "fsfloaterim.h"
-#include "llvoiceclient.h"
-#include "lltoolbarview.h"
+#include "fsfloaternearbychat.h"
+#include "llfloaterreg.h"
 #include "llchiclet.h"
 #include "llchicletbar.h"
+#include "lltoolbarview.h"
+#include "llvoiceclient.h"
 
 static const F32 VOICE_STATUS_UPDATE_INTERVAL = 1.0f;
 
@@ -340,8 +334,10 @@ void FSFloaterIMContainer::onNewMessageReceived(const LLSD& data)
 	if (floaterp && current_floater && floaterp != current_floater
 		&& (gSavedSettings.getBOOL("FSIMChatFlashOnFriendStatusChange") || !data.has("from_id") || data["from_id"].asUUID().notNull()))
 	{
-		if(LLMultiFloater::isFloaterFlashing(floaterp))
+		if (LLMultiFloater::isFloaterFlashing(floaterp))
+		{
 			LLMultiFloater::setFloaterFlashing(floaterp, FALSE);
+		}
 		LLMultiFloater::setFloaterFlashing(floaterp, TRUE);
 	}
 }
diff --git a/indra/newview/fsfloaterimcontainer.h b/indra/newview/fsfloaterimcontainer.h
index f2f2c33627..51759ca5d8 100644
--- a/indra/newview/fsfloaterimcontainer.h
+++ b/indra/newview/fsfloaterimcontainer.h
@@ -30,13 +30,7 @@
 #ifndef FS_FLOATERIMCONTAINER_H
 #define FS_FLOATERIMCONTAINER_H
 
-#include <map>
-#include <vector>
-
-#include "llfloater.h"
 #include "llmultifloater.h"
-#include "llavatarpropertiesprocessor.h"
-#include "llgroupmgr.h"
 #include "llimview.h"
 
 class LLTabContainer;
@@ -97,7 +91,7 @@ private:
 	eVoiceState	mCurrentVoiceState;
 	bool		mForceVoiceStateUpdate;
 
-	typedef std::map<LLUUID,LLFloater*> avatarID_panel_map_t;
+	typedef std::map<LLUUID, LLFloater*> avatarID_panel_map_t;
 	avatarID_panel_map_t mSessions;
 	boost::signals2::connection mNewMessageConnection;