From 3c8270c4dd60938c16c6f25110a10f71352156c5 Mon Sep 17 00:00:00 2001 From: Eugene Kondrashev Date: Mon, 9 Nov 2009 18:32:17 +0200 Subject: Implemented Sub-task EXT-1906 All speakers handling functional in old IM Floaters (Communicate) should be present in new IM Floaters/IM control panels, EXCLUDING voice related mute/moderation stuff --HG-- branch : product-engine --- indra/newview/llparticipantlist.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'indra/newview/llparticipantlist.h') diff --git a/indra/newview/llparticipantlist.h b/indra/newview/llparticipantlist.h index fc34dd308b..1ff1515d16 100644 --- a/indra/newview/llparticipantlist.h +++ b/indra/newview/llparticipantlist.h @@ -32,6 +32,8 @@ #include "llviewerprecompiledheaders.h" #include "llevent.h" +#include "llpanelpeoplemenus.h" +#include "llimview.h" class LLSpeakerMgr; class LLAvatarList; @@ -105,6 +107,25 @@ class LLParticipantList SpeakerModeratorUpdateListener(LLParticipantList& parent) : BaseSpeakerListner(parent) {} /*virtual*/ bool handleEvent(LLPointer event, const LLSD& userdata); }; + + /** + * Menu used in the participant list. + */ + class LLParticipantListMenu : public LLPanelPeopleMenus::ContextMenu + { + public: + LLParticipantListMenu(LLParticipantList& parent):mParent(parent){}; + /*virtual*/ LLContextMenu* createMenu(); + protected: + LLParticipantList& mParent; + private: + bool enableContextMenuItem(const LLSD& userdata); + bool checkContextMenuItem(const LLSD& userdata); + + void toggleAllowTextChat(const LLSD& userdata); + void toggleMuteText(const LLSD& userdata); + + }; private: void onAvatarListDoubleClicked(LLAvatarList* list); @@ -121,5 +142,7 @@ class LLParticipantList LLPointer mSpeakerClearListener; LLPointer mSpeakerModeratorListener; + LLParticipantListMenu* mParticipantListMenu; + EParticipantSortOrder mSortOrder; }; -- cgit v1.2.3 From 60a7a1d891b5c019aa6fc0f7d54046976f31a9f3 Mon Sep 17 00:00:00 2001 From: Eugene Kondrashev Date: Tue, 10 Nov 2009 15:25:39 +0200 Subject: Implemented Sub-task EXT-2214-Refactor IM Control Panels --HG-- branch : product-engine --- indra/newview/llparticipantlist.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llparticipantlist.h') diff --git a/indra/newview/llparticipantlist.h b/indra/newview/llparticipantlist.h index 1ff1515d16..6fe178b023 100644 --- a/indra/newview/llparticipantlist.h +++ b/indra/newview/llparticipantlist.h @@ -34,9 +34,9 @@ #include "llevent.h" #include "llpanelpeoplemenus.h" #include "llimview.h" +#include "llavatarlist.h" class LLSpeakerMgr; -class LLAvatarList; class LLUICtrl; class LLParticipantList @@ -45,6 +45,7 @@ class LLParticipantList public: LLParticipantList(LLSpeakerMgr* data_source, LLAvatarList* avatar_list); ~LLParticipantList(); + void setSpeakingIndicatorsVisible(BOOL visible){ mAvatarList->setSpeakingIndicatorsVisible(visible); }; typedef enum e_participant_sort_oder { E_SORT_BY_NAME = 0, -- cgit v1.2.3 From e292f310fbd1c98d62237eef27d284e024abe7ee Mon Sep 17 00:00:00 2001 From: Eugene Kondrashev Date: Tue, 10 Nov 2009 15:35:58 +0200 Subject: No ticket. Cleaned up the code after last commit --HG-- branch : product-engine --- indra/newview/llparticipantlist.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llparticipantlist.h') diff --git a/indra/newview/llparticipantlist.h b/indra/newview/llparticipantlist.h index 6fe178b023..5e26c39fc8 100644 --- a/indra/newview/llparticipantlist.h +++ b/indra/newview/llparticipantlist.h @@ -34,9 +34,9 @@ #include "llevent.h" #include "llpanelpeoplemenus.h" #include "llimview.h" -#include "llavatarlist.h" class LLSpeakerMgr; +class LLAvatarList; class LLUICtrl; class LLParticipantList @@ -45,7 +45,7 @@ class LLParticipantList public: LLParticipantList(LLSpeakerMgr* data_source, LLAvatarList* avatar_list); ~LLParticipantList(); - void setSpeakingIndicatorsVisible(BOOL visible){ mAvatarList->setSpeakingIndicatorsVisible(visible); }; + void setSpeakingIndicatorsVisible(BOOL visible); typedef enum e_participant_sort_oder { E_SORT_BY_NAME = 0, -- cgit v1.2.3