Automated merge up from viewer 2.0 trunk.

Some llvoiceclient changes duplicated changes that had already been
made in the voice modularization refactor, so the refactor versions
were used.

1 files changed, 11 insertions, 4 deletions

diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 41c20597b1..3daa407925 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -4189,19 +4189,26 @@ void LLVivoxVoiceClient::sessionState::removeAllParticipants()
 	}
 }
 
-std::vector<LLUUID> LLVivoxVoiceClient::getParticipantList(void)
+void LLVivoxVoiceClient::getParticipantList(std::set<LLUUID> &participants)
 {
-	std::vector<LLUUID> result;
 	if(mAudioSession)
 	{
 		for(participantUUIDMap::iterator iter = mAudioSession->mParticipantsByUUID.begin();
 			iter != mAudioSession->mParticipantsByUUID.end(); 
 			iter++)
 		{
-			result.push_back(iter->first);
+			participants.insert(iter->first);
 		}
 	}
-	return result;
+}
+
+bool LLVivoxVoiceClient::isParticipant(const LLUUID &speaker_id)
+{
+  if(mAudioSession)
+    {
+      return (mAudioSession->mParticipantsByUUID.find(speaker_id) != mAudioSession->mParticipantsByUUID.end());
+    }
+  return false;
 }