From eca66a2aa6b507bad1e168bcfafb18e4d389caa1 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Fri, 11 Dec 2009 17:00:49 +0200 Subject: Work on major task EXT-2808 (Add speakers moderation (both voice and text) to the Voice Control Panel (Active Speakers List)) -- added updating of participant list to display participants not in voice as disabled. Unfortunatly I have to perform refreshing in a draw to mad it workable till beta 0. --HG-- branch : product-engine --- indra/newview/llcallfloater.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'indra/newview/llcallfloater.h') diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h index b615f57d5b..52f9595435 100644 --- a/indra/newview/llcallfloater.h +++ b/indra/newview/llcallfloater.h @@ -35,6 +35,7 @@ #define LL_LLCALLFLOATER_H #include "lldockablefloater.h" +#include "llvoiceclient.h" class LLAvatarList; class LLNonAvatarCaller; @@ -52,7 +53,7 @@ class LLSpeakerMgr; * 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 +class LLCallFloater : public LLDockableFloater, LLVoiceClientParticipantObserver { public: LLCallFloater(const LLSD& key); @@ -60,6 +61,14 @@ public: /*virtual*/ BOOL postBuild(); /*virtual*/ void onOpen(const LLSD& key); + /*virtual*/ void draw(); + + /** + * Is called by LLVoiceClient::notifyParticipantObservers when voice participant list is changed. + * + * Refreshes list to display participants not in voice as disabled. + */ + /*virtual*/ void onChange(); private: typedef enum e_voice_controls_type -- cgit v1.2.3 From f0188645c72126782f08f27fe7104d73e635ddb9 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Fri, 11 Dec 2009 18:38:29 +0200 Subject: Work on major task EXT-2808 (Add speakers moderation (both voice and text) to the Voice Control Panel (Active Speakers List)) -- added showing notification that user was muted by moderator --HG-- branch : product-engine --- indra/newview/llcallfloater.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview/llcallfloater.h') diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h index 52f9595435..931f830937 100644 --- a/indra/newview/llcallfloater.h +++ b/indra/newview/llcallfloater.h @@ -39,9 +39,9 @@ class LLAvatarList; class LLNonAvatarCaller; +class LLOutputMonitorCtrl; 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. @@ -103,6 +103,8 @@ private: LLAvatarList* mAvatarList; LLNonAvatarCaller* mNonAvatarCaller; EVoiceControls mVoiceType; + LLOutputMonitorCtrl* mSpeakingIndicator; + bool mIsModeratorMuted; boost::signals2::connection mChannelChangedConnection; }; -- cgit v1.2.3 From c57138b64777a51289d62e575ef73c04d060c344 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Fri, 11 Dec 2009 19:29:41 +0200 Subject: Work on major task EXT-2808 (Add speakers moderation (both voice and text) to the Voice Control Panel (Active Speakers List)) -- added showing notification that user was muted by moderator (missing changes in the header file) --HG-- branch : product-engine --- indra/newview/llcallfloater.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llcallfloater.h') diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h index 931f830937..79b0fca061 100644 --- a/indra/newview/llcallfloater.h +++ b/indra/newview/llcallfloater.h @@ -96,6 +96,7 @@ private: void onCurrentChannelChanged(const LLUUID& session_id); void updateTitle(); void initAgentData(); + void setModeratorMutedVoice(bool moderator_muted); private: LLSpeakerMgr* mSpeakerManager; @@ -104,7 +105,7 @@ private: LLNonAvatarCaller* mNonAvatarCaller; EVoiceControls mVoiceType; LLOutputMonitorCtrl* mSpeakingIndicator; - bool mIsModeratorMuted; + bool mIsModeratorMutedVoice; boost::signals2::connection mChannelChangedConnection; }; -- cgit v1.2.3 From a5f4531315f8f8c5711e2298019586c6ae0dba76 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Fri, 11 Dec 2009 19:56:45 +0200 Subject: Work on major task EXT-2808 (Add speakers moderation (both voice and text) to the Voice Control Panel (Active Speakers List)) -- added showing Moderator label near the agent's name if she is a group moderator --HG-- branch : product-engine --- indra/newview/llcallfloater.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llcallfloater.h') diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h index 79b0fca061..b2288a42ff 100644 --- a/indra/newview/llcallfloater.h +++ b/indra/newview/llcallfloater.h @@ -97,6 +97,7 @@ private: void updateTitle(); void initAgentData(); void setModeratorMutedVoice(bool moderator_muted); + void updateModeratorState(); private: LLSpeakerMgr* mSpeakerManager; @@ -104,6 +105,7 @@ private: LLAvatarList* mAvatarList; LLNonAvatarCaller* mNonAvatarCaller; EVoiceControls mVoiceType; + LLPanel* mAgentPanel; LLOutputMonitorCtrl* mSpeakingIndicator; bool mIsModeratorMutedVoice; -- cgit v1.2.3