Skip to content
Snippets Groups Projects
Commit 7b41de5f authored by Mike Antipov's avatar Mike Antipov
Browse files

Work on normal task EXT-2214 Refactor IM Control Panels

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

--HG--
branch : product-engine
parent 1a8325f4
No related branches found
No related tags found
No related merge requests found
...@@ -245,7 +245,6 @@ void LLPanelIMControlPanel::nameUpdatedCallback(const LLUUID& id, const std::str ...@@ -245,7 +245,6 @@ void LLPanelIMControlPanel::nameUpdatedCallback(const LLUUID& id, const std::str
LLPanelGroupControlPanel::LLPanelGroupControlPanel(const LLUUID& session_id): LLPanelGroupControlPanel::LLPanelGroupControlPanel(const LLUUID& session_id):
mParticipantList(NULL) mParticipantList(NULL)
{ {
mSpeakerManager = LLIMModel::getInstance()->getSpeakerManager(session_id);
} }
BOOL LLPanelGroupControlPanel::postBuild() BOOL LLPanelGroupControlPanel::postBuild()
...@@ -304,7 +303,10 @@ void LLPanelGroupControlPanel::setSessionId(const LLUUID& session_id) ...@@ -304,7 +303,10 @@ void LLPanelGroupControlPanel::setSessionId(const LLUUID& session_id)
// for group and Ad-hoc chat we need to include agent into list // for group and Ad-hoc chat we need to include agent into list
if(!mParticipantList) 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);
}
} }
......
...@@ -37,8 +37,6 @@ ...@@ -37,8 +37,6 @@
#include "llvoicechannel.h" #include "llvoicechannel.h"
#include "llcallingcard.h" #include "llcallingcard.h"
class LLSpeakerMgr;
class LLAvatarList;
class LLParticipantList; class LLParticipantList;
class LLPanelChatControlPanel : public LLPanel class LLPanelChatControlPanel : public LLPanel
...@@ -110,7 +108,6 @@ class LLPanelGroupControlPanel : public LLPanelChatControlPanel ...@@ -110,7 +108,6 @@ class LLPanelGroupControlPanel : public LLPanelChatControlPanel
protected: protected:
LLUUID mGroupID; LLUUID mGroupID;
LLSpeakerMgr* mSpeakerManager;
LLParticipantList* mParticipantList; LLParticipantList* mParticipantList;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment