Merge changes from product-engine

1 files changed, 24 insertions, 0 deletions

diff --git a/indra/newview/llparticipantlist.h b/indra/newview/llparticipantlist.h
index fc34dd308b..5e26c39fc8 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;
@@ -43,6 +45,7 @@ class LLParticipantList
 	public:
 		LLParticipantList(LLSpeakerMgr* data_source, LLAvatarList* avatar_list);
 		~LLParticipantList();
+		void setSpeakingIndicatorsVisible(BOOL visible);
 
 		typedef enum e_participant_sort_oder {
 			E_SORT_BY_NAME = 0,
@@ -105,6 +108,25 @@ class LLParticipantList
 			SpeakerModeratorUpdateListener(LLParticipantList& parent) : BaseSpeakerListner(parent) {}
 			/*virtual*/ bool handleEvent(LLPointer<LLOldEvents::LLEvent> 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 +143,7 @@ class LLParticipantList
 		LLPointer<SpeakerClearListener>				mSpeakerClearListener;
 		LLPointer<SpeakerModeratorUpdateListener>	mSpeakerModeratorListener;
 
+		LLParticipantListMenu*    mParticipantListMenu;
+
 		EParticipantSortOrder	mSortOrder;
 };