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, 13 insertions, 3 deletions

diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 0105e584c5..ea83d999a6 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -253,18 +253,28 @@ const LLVoiceDeviceList& LLVoiceClient::getRenderDevices()
 //--------------------------------------------------
 // participants
 
-std::vector<LLUUID> LLVoiceClient::getParticipantList(void)
+void LLVoiceClient::getParticipantList(std::set<LLUUID> &participants)
 {
 	if (mVoiceModule) 
 	{
-		return mVoiceModule->getParticipantList();
+	  mVoiceModule->getParticipantList(participants);
 	}
 	else
 	{
-		return std::vector<LLUUID>();
+	  participants = std::set<LLUUID>();
 	}
 }
 
+bool LLVoiceClient::isParticipant(const LLUUID &speaker_id)
+{
+  if(mVoiceModule)
+    {
+      return mVoiceModule->isParticipant(speaker_id);
+    }
+  return false;
+}
+
+
 //--------------------------------------------------
 // text chat