From 9d941cf1193eaaf333dd1c9427256786b1bc60c8 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 25 Nov 2009 14:52:39 +0200
Subject: Work on major sub-task EXT-2790 (Complete Voice Control Panel
 (floater) started by Lynx (LLVoiceControlPanel))  -- Implemented speakers
 list for local chat.

--HG--
branch : product-engine
---
 indra/newview/llcallfloater.cpp                      | 20 ++++++++++++++++++++
 indra/newview/llcallfloater.h                        | 10 ++++++++++
 .../skins/default/xui/en/floater_voice_controls.xml  |  3 ++-
 3 files changed, 32 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index c6d54995bf..eaa048f5aa 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -35,15 +35,35 @@
 
 #include "llcallfloater.h"
 
+#include "llavatarlist.h"
+#include "llparticipantlist.h"
+#include "llspeakers.h"
+
 
 LLCallFloater::LLCallFloater()
 : LLFloater(LLSD())
+, mSpeakerManager(NULL)
+, mPaticipants(NULL)
+, mAvatarList(NULL)
 {
 	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_voice_controls.xml", NULL);
 }
 
 LLCallFloater::~LLCallFloater()
 {
+	delete mPaticipants;
+	mPaticipants = NULL;
+}
+
+// virtual
+BOOL LLCallFloater::postBuild()
+{
+	LLFloater::postBuild();
+	mAvatarList = getChild<LLAvatarList>("speakers_list");
+
+	mSpeakerManager = LLLocalSpeakerMgr::getInstance();
+	mPaticipants = new LLParticipantList(mSpeakerManager, mAvatarList);
 
+	return TRUE;
 }
 //EOF
diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h
index dde4085d00..3e672eec79 100644
--- a/indra/newview/llcallfloater.h
+++ b/indra/newview/llcallfloater.h
@@ -36,6 +36,10 @@
 
 #include "llfloater.h"
 
+class LLAvatarList;
+class LLParticipantList;
+class LLSpeakerMgr;
+
 /**
  * The Voice Control Panel is an ambient window summoned by clicking the flyout chevron on the Speak button.
  * It can be torn-off and freely positioned onscreen.
@@ -53,7 +57,13 @@ public:
 	LLCallFloater();
 	~LLCallFloater();
 
+	/*virtual*/ BOOL postBuild();
+
 
+private:
+	LLSpeakerMgr* mSpeakerManager;
+	LLParticipantList* mPaticipants;
+	LLAvatarList* mAvatarList;
 };
 
 
diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 705b4276e3..82b4372a4b 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -87,9 +87,10 @@
     <avatar_list
      follows="all"
      height="197"
+     ignore_online_status="true"
      layout="topleft"
      left="0"
      multi_select="true"
-     name="avatar_list"
+     name="speakers_list"
      width="282" />
 </floater>
-- 
cgit v1.2.3