From b43771cad585cb9820941eb1b24b67390eaa9435 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Fri, 23 Oct 2009 17:20:45 +0000
Subject: Merging revisions 2156-2183 of
 https://svn.aws.productengine.com/secondlife/pe/stable-2 into
 P:\svn\viewer-2.0.0-3, respecting ancestry * Bugs: EXT-1590 EXT-1694 EXT-1660
 EXT-1646 EXT-1694 EXT-1316 EXT-1775 EXT-1798 EXT-1799 EXT-1117 EXT-1571
 EXT-1572 * Dev: EXT-1757 EXT-991 EXT-1758 EXT-1770 EXT-1192 EXT-1613 EXT-1611
 EXT-1256 EXT-1758 EXT-747

---
 indra/newview/llpanelimcontrolpanel.cpp | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'indra/newview/llpanelimcontrolpanel.cpp')

diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp
index a7590ac1dd..6eed956eb8 100644
--- a/indra/newview/llpanelimcontrolpanel.cpp
+++ b/indra/newview/llpanelimcontrolpanel.cpp
@@ -38,6 +38,9 @@
 #include "llavatariconctrl.h"
 #include "llbutton.h"
 #include "llgroupactions.h"
+#include "llavatarlist.h"
+#include "llparticipantlist.h"
+#include "llimview.h"
 
 LLPanelIMControlPanel::LLPanelIMControlPanel()
 {
@@ -89,15 +92,35 @@ void LLPanelIMControlPanel::setID(const LLUUID& avatar_id)
 }
 
 
+LLPanelGroupControlPanel::LLPanelGroupControlPanel(const LLUUID& session_id)
+{
+	mSpeakerManager = LLIMModel::getInstance()->getSpeakerManager(session_id);
+}
 
 BOOL LLPanelGroupControlPanel::postBuild()
 {
 	childSetAction("group_info_btn", boost::bind(&LLPanelGroupControlPanel::onGroupInfoButtonClicked, this));
 	childSetAction("call_btn", boost::bind(&LLPanelGroupControlPanel::onCallButtonClicked, this));
 
+	mAvatarList = getChild<LLAvatarList>("speakers_list");
+	mParticipantList = new LLParticipantList(mSpeakerManager, mAvatarList);
+
 	return TRUE;
 }
 
+LLPanelGroupControlPanel::~LLPanelGroupControlPanel()
+{
+	delete mParticipantList;
+	mParticipantList = NULL;
+}
+
+// virtual
+void LLPanelGroupControlPanel::draw()
+{
+	mSpeakerManager->update(true);
+	LLPanelChatControlPanel::draw();
+}
+
 void LLPanelGroupControlPanel::onGroupInfoButtonClicked()
 {
 	LLGroupActions::show(mGroupID);
-- 
cgit v1.3