Work on normal task EXT-2214 Refactor IM Control Panels

-- removed reference to LLSpeakerMgr from LLPanelGroupControlPanel (group text chat)

--HG--
branch : product-engine

2 files changed, 4 insertions, 5 deletions

diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp
index 86bdee7c7d..a334eb9d68 100644
--- a/indra/newview/llpanelimcontrolpanel.cpp
+++ b/indra/newview/llpanelimcontrolpanel.cpp
@@ -245,7 +245,6 @@ void LLPanelIMControlPanel::nameUpdatedCallback(const LLUUID& id, const std::str
 LLPanelGroupControlPanel::LLPanelGroupControlPanel(const LLUUID& session_id):
 mParticipantList(NULL)
 {
-	mSpeakerManager = LLIMModel::getInstance()->getSpeakerManager(session_id);
 }
 
 BOOL LLPanelGroupControlPanel::postBuild()
@@ -304,7 +303,10 @@ void LLPanelGroupControlPanel::setSessionId(const LLUUID& session_id)
 
 	// for group and Ad-hoc chat we need to include agent into list 
 	if(!mParticipantList)
-		mParticipantList = new LLParticipantList(mSpeakerManager, getChild<LLAvatarList>("speakers_list"), true,false);
+	{
+		LLSpeakerMgr* speaker_manager = LLIMModel::getInstance()->getSpeakerManager(session_id);
+		mParticipantList = new LLParticipantList(speaker_manager, getChild<LLAvatarList>("speakers_list"), true,false);
+	}
 }
 
 
diff --git a/indra/newview/llpanelimcontrolpanel.h b/indra/newview/llpanelimcontrolpanel.h
index c18be5a6df..25fdf944c9 100644
--- a/indra/newview/llpanelimcontrolpanel.h
+++ b/indra/newview/llpanelimcontrolpanel.h
@@ -37,8 +37,6 @@
 #include "llvoicechannel.h"
 #include "llcallingcard.h"
 
-class LLSpeakerMgr;
-class LLAvatarList;
 class LLParticipantList;
 
 class LLPanelChatControlPanel : public LLPanel
@@ -110,7 +108,6 @@ public:
 
 protected:
 	LLUUID mGroupID;
-	LLSpeakerMgr* mSpeakerManager;
 
 	LLParticipantList* mParticipantList;