Merge with recent viewer-2-0

1 files changed, 19 insertions, 2 deletions

diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h
index bfaa1075c4..b615f57d5b 100644
--- a/indra/newview/llcallfloater.h
+++ b/indra/newview/llcallfloater.h
@@ -37,6 +37,7 @@
 #include "lldockablefloater.h"
 
 class LLAvatarList;
+class LLNonAvatarCaller;
 class LLParticipantList;
 class LLSpeakerMgr;
 
@@ -48,8 +49,8 @@ class LLSpeakerMgr;
  * 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.
+ * When the Resident is engaged in any chat except Nearby Chat, the Voice Control Panel also provides an 
+ * 'Leave Call' button to allow the Resident to leave that voice channel.
  */
 class LLCallFloater : public LLDockableFloater
 {
@@ -61,6 +62,16 @@ public:
 	/*virtual*/ void onOpen(const LLSD& key);
 
 private:
+	typedef enum e_voice_controls_type
+	{
+		VC_LOCAL_CHAT,
+		VC_GROUP_CHAT,
+		VC_AD_HOC_CHAT,
+		VC_PEER_TO_PEER
+	}EVoiceControls;
+
+	void leaveCall();
+
 	/**
 	 * Updates mSpeakerManager and list according to current Voice Channel
 	 *
@@ -74,11 +85,17 @@ private:
 	 */
 	void refreshPartisipantList();
 	void onCurrentChannelChanged(const LLUUID& session_id);
+	void updateTitle();
+	void initAgentData();
 
 private:
 	LLSpeakerMgr* mSpeakerManager;
 	LLParticipantList* mPaticipants;
 	LLAvatarList* mAvatarList;
+	LLNonAvatarCaller* mNonAvatarCaller;
+	EVoiceControls mVoiceType;
+
+	boost::signals2::connection mChannelChangedConnection;
 };