From df58153514f6b361c65efc5dd6d31d39f68603c0 Mon Sep 17 00:00:00 2001 From: AlexanderP ProductEngine Date: Mon, 14 May 2012 15:44:57 +0300 Subject: CHUI-113 WIP all voice controls is moved from a IM-control panel to the IM floater; IMControlPanel is removed; simplified voice button's listener behavior --- indra/newview/llpanelimcontrolpanel.h | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) (limited to 'indra/newview/llpanelimcontrolpanel.h') diff --git a/indra/newview/llpanelimcontrolpanel.h b/indra/newview/llpanelimcontrolpanel.h index bba847b5d4..3466da33a1 100644 --- a/indra/newview/llpanelimcontrolpanel.h +++ b/indra/newview/llpanelimcontrolpanel.h @@ -28,14 +28,12 @@ #define LL_LLPANELIMCONTROLPANEL_H #include "llpanel.h" -#include "llvoicechannel.h" #include "llcallingcard.h" class LLParticipantList; -class LLPanelChatControlPanel +class LLPanelChatControlPanel : public LLPanel - , public LLVoiceClientStatusObserver { public: LLPanelChatControlPanel() : @@ -44,21 +42,6 @@ public: virtual BOOL postBuild(); - void onCallButtonClicked(); - void onEndCallButtonClicked(); - void onOpenVoiceControlsClicked(); - - // Implements LLVoiceClientStatusObserver::onChange() to enable the call - // button when voice is available - /*virtual*/ void onChange(EStatusType status, const std::string &channelURI, bool proximal); - - virtual void onVoiceChannelStateChanged(const LLVoiceChannel::EState& old_state, const LLVoiceChannel::EState& new_state); - - void updateButtons(LLVoiceChannel::EState state); - - // Enables/disables call button depending on voice availability - void updateCallButton(); - virtual void setSessionId(const LLUUID& session_id); const LLUUID& getSessionId() { return mSessionId; } @@ -70,7 +53,7 @@ private: }; -class LLPanelIMControlPanel : public LLPanelChatControlPanel, LLFriendObserver +class LLPanelIMControlPanel : public LLPanelChatControlPanel { public: LLPanelIMControlPanel(); @@ -78,10 +61,7 @@ public: BOOL postBuild(); - void setSessionId(const LLUUID& session_id); - - // LLFriendObserver trigger - virtual void changed(U32 mask); + //void setSessionId(const LLUUID& session_id); protected: void onNameCache(const LLUUID& id, const std::string& full_name, bool is_group); @@ -93,13 +73,9 @@ private: void onTeleportButtonClicked(); void onPayButtonClicked(); void onFocusReceived(); - - void onClickMuteVolume(); void onClickBlock(); void onClickUnblock(); /*virtual*/ void draw(); - void onVolumeChange(const LLSD& data); - LLUUID mAvatarID; }; @@ -123,7 +99,6 @@ 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 -- cgit v1.2.3 From c866b094ee000172f7cd820692f228f3f0afddc8 Mon Sep 17 00:00:00 2001 From: AlexanderP ProductEngine Date: Mon, 14 May 2012 21:19:18 +0300 Subject: CHUI-113 WIP clean-up (obsolete code was removed) --- indra/newview/llpanelimcontrolpanel.h | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'indra/newview/llpanelimcontrolpanel.h') diff --git a/indra/newview/llpanelimcontrolpanel.h b/indra/newview/llpanelimcontrolpanel.h index 3466da33a1..0ec992bb1e 100644 --- a/indra/newview/llpanelimcontrolpanel.h +++ b/indra/newview/llpanelimcontrolpanel.h @@ -52,34 +52,6 @@ private: boost::signals2::connection mVoiceChannelStateChangeConnection; }; - -class LLPanelIMControlPanel : public LLPanelChatControlPanel -{ -public: - LLPanelIMControlPanel(); - ~LLPanelIMControlPanel(); - - BOOL postBuild(); - - //void setSessionId(const LLUUID& session_id); - -protected: - void onNameCache(const LLUUID& id, const std::string& full_name, bool is_group); - -private: - void onViewProfileButtonClicked(); - void onAddFriendButtonClicked(); - void onShareButtonClicked(); - void onTeleportButtonClicked(); - void onPayButtonClicked(); - void onFocusReceived(); - void onClickBlock(); - void onClickUnblock(); - /*virtual*/ void draw(); - LLUUID mAvatarID; -}; - - class LLPanelGroupControlPanel : public LLPanelChatControlPanel { public: -- cgit v1.2.3 From 0ed7966bd5471e4152ade9ac63e81406b4d0a679 Mon Sep 17 00:00:00 2001 From: AlexanderP ProductEngine Date: Tue, 15 May 2012 20:42:14 +0300 Subject: CHUI-105 WIP Remove obsolete controls from the group's control pane --- indra/newview/llpanelimcontrolpanel.h | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llpanelimcontrolpanel.h') diff --git a/indra/newview/llpanelimcontrolpanel.h b/indra/newview/llpanelimcontrolpanel.h index 0ec992bb1e..02915ec4bb 100644 --- a/indra/newview/llpanelimcontrolpanel.h +++ b/indra/newview/llpanelimcontrolpanel.h @@ -69,7 +69,6 @@ protected: LLParticipantList* mParticipantList; private: - void onGroupInfoButtonClicked(); void onSortMenuItemClicked(const LLSD& userdata); }; -- cgit v1.2.3