From 7b41de5fac1e95a0623b519fbb7dd3d93d9fc42a Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Fri, 22 Jan 2010 15:16:53 +0200
Subject: [PATCH] Work on normal task EXT-2214 Refactor IM Control Panels --
removed reference to LLSpeakerMgr from LLPanelGroupControlPanel (group text
chat)
--HG--
branch : product-engine
---
indra/newview/llpanelimcontrolpanel.cpp | 6 ++++--
indra/newview/llpanelimcontrolpanel.h | 3 ---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp
index 86bdee7c7d5..a334eb9d680 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 c18be5a6df9..25fdf944c92 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 @@ class LLPanelGroupControlPanel : public LLPanelChatControlPanel
protected:
LLUUID mGroupID;
- LLSpeakerMgr* mSpeakerManager;
LLParticipantList* mParticipantList;
--
GitLab