diff options
author | Eugene Kondrashev <ekondrashev@productengine.com> | 2009-11-04 21:33:14 +0200 |
---|---|---|
committer | Eugene Kondrashev <ekondrashev@productengine.com> | 2009-11-04 21:33:14 +0200 |
commit | eb02d77ff5d20b99cc35fe9082cf5a22f634a7e1 (patch) | |
tree | 80d2e9bb12e6633655b9fa50c52f57105cff2bc1 /indra/newview/llpanelimcontrolpanel.h | |
parent | fbf314cb5593a678e337092186c0e36fed59dbab (diff) |
Implemented major sub-task EXT-2131 - Output monitor contols should only be shown for Group Chat and Adhoc Chat when in a Voice Call. Added onStateChange callback support for voice channel. Added showing/hiding logic of speaking indicator.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpanelimcontrolpanel.h')
-rw-r--r-- | indra/newview/llpanelimcontrolpanel.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llpanelimcontrolpanel.h b/indra/newview/llpanelimcontrolpanel.h index fa101f4280..1f38bffb53 100644 --- a/indra/newview/llpanelimcontrolpanel.h +++ b/indra/newview/llpanelimcontrolpanel.h @@ -34,6 +34,7 @@ #define LL_LLPANELIMCONTROLPANEL_H #include "llpanel.h" +#include "llvoicechannel.h" class LLSpeakerMgr; class LLAvatarList; @@ -52,7 +53,9 @@ public: void onEndCallButtonClicked(); void onOpenVoiceControlsClicked(); - virtual void setSessionId(const LLUUID& session_id) { mSessionId = session_id; } + virtual void onVoiceChannelStateChanged(const LLVoiceChannel::EState& old_state, const LLVoiceChannel::EState& new_state); + + virtual void setSessionId(const LLUUID& session_id); private: LLUUID mSessionId; @@ -100,6 +103,7 @@ protected: private: void onGroupInfoButtonClicked(); void onSortMenuItemClicked(const LLSD& userdata); + /*virtual*/ void onVoiceChannelStateChanged(const LLVoiceChannel::EState& old_state, const LLVoiceChannel::EState& new_state); }; class LLPanelAdHocControlPanel : public LLPanelGroupControlPanel |