Fixed normal priority bug EXT-3677 (Resident doesn't appear in the nearby voice list after enabling voice).

 * Avatars having voice chat disabled will not be displayed in the voice control panel.
 * If an avatar disables and then re-enables voice chat, it will re-appear in the VCP.
 * Avatars that are not in the nearby chat range anymore, will be immediately removed from the VCP
   (were displayed in italic for a few seconds).

--HG--
branch : product-engine

1 files changed, 20 insertions, 8 deletions

diff --git a/indra/newview/llparticipantlist.h b/indra/newview/llparticipantlist.h
index c4eb180917..d15ec980db 100644
--- a/indra/newview/llparticipantlist.h
+++ b/indra/newview/llparticipantlist.h
@@ -44,6 +44,9 @@ class LLParticipantList
 {
 	LOG_CLASS(LLParticipantList);
 	public:
+
+		typedef boost::function<bool (const LLUUID& speaker_id)> validate_speaker_callback_t;
+
 		LLParticipantList(LLSpeakerMgr* data_source, LLAvatarList* avatar_list, bool use_context_menu = true, bool exclude_agent = true);
 		~LLParticipantList();
 		void setSpeakingIndicatorsVisible(BOOL visible);
@@ -54,6 +57,13 @@ class LLParticipantList
 		} EParticipantSortOrder;
 
 		/**
+		 * Adds specified avatar ID to the existing list if it is not Agent's ID
+		 *
+		 * @param[in] avatar_id - Avatar UUID to be added into the list
+		 */
+		void addAvatarIDExceptAgent(const LLUUID& avatar_id);
+
+		/**
 		 * Set and sort Avatarlist by given order
 		 */
 		void setSortOrder(EParticipantSortOrder order = E_SORT_BY_NAME);
@@ -64,6 +74,15 @@ class LLParticipantList
 		 */
 		void updateRecentSpeakersOrder();
 
+		/**
+		 * Set a callback to be called before adding a speaker. Invalid speakers will not be added.
+		 *
+		 * If the callback is unset all speakers are considered as valid.
+		 *
+		 * @see onAddItemEvent()
+		 */
+		void setValidateSpeakerCallback(validate_speaker_callback_t cb);
+
 	protected:
 		/**
 		 * LLSpeakerMgr event handlers
@@ -218,14 +237,6 @@ class LLParticipantList
 		void onAvatarListRefreshed(LLUICtrl* ctrl, const LLSD& param);
 
 		/**
-		 * Adds specified avatar ID to the existing list if it is not Agent's ID
-		 *
-		 * @param[in, out] existing_list - vector with avatars' UUIDs already in the list
-		 * @param[in] avatar_id - Avatar UUID to be added into the list
-		 */
-		void addAvatarIDExceptAgent(std::vector<LLUUID>& existing_list, const LLUUID& avatar_id);
-
-		/**
 		 * Adjusts passed participant to work properly.
 		 *
 		 * Adds SpeakerMuteListener to process moderation actions.
@@ -260,4 +271,5 @@ class LLParticipantList
 		boost::signals2::connection mAvatarListReturnConnection;
 
 		LLPointer<LLAvatarItemRecentSpeakerComparator> mSortByRecentSpeakers;
+		validate_speaker_callback_t mValidateSpeakerCallback;
 };