merge

--HG--
branch : product-engine

1 files changed, 21 insertions, 7 deletions

diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h
index 3732379da2..f1afddb1cc 100644
--- a/indra/newview/llcallfloater.h
+++ b/indra/newview/llcallfloater.h
@@ -36,20 +36,34 @@
 
 #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.

- *

- * When the Resident is engaged in Nearby Voice Chat, the Voice Control Panel provides control over 

- * the Resident's own microphone input volume, the audible volume of each of the other participants,

- * the Resident's own Voice Morphing settings (if she has subscribed to enable the feature), and Voice Recording.

- *

+ * 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.
+ *
+ * When the Resident is engaged in Nearby Voice Chat, the Voice Control Panel provides control over 
+ * the Resident's own microphone input volume, the audible volume of each of the other participants,
+ * the Resident's own Voice Morphing settings (if she has subscribed to enable the feature), and Voice Recording.
+ *
  * When the Resident is engaged in Group Voice Chat, the Voice Control Panel also provides an 
  * 'End Call' button to allow the Resident to leave that voice channel.
  */
 class LLCallFloater : public LLFloater
 {
+public:
+	LLCallFloater();
+	~LLCallFloater();
+
+	/*virtual*/ BOOL postBuild();
+
 
+private:
+	LLSpeakerMgr* mSpeakerManager;
+	LLParticipantList* mPaticipants;
+	LLAvatarList* mAvatarList;
 };