1 files changed, 8 insertions, 10 deletions

diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp
index 8c908449a0..feaf7335c0 100644
--- a/indra/newview/llparticipantlist.cpp
+++ b/indra/newview/llparticipantlist.cpp
@@ -95,7 +95,7 @@ public:
 	void onChange()
 	{
 		uuid_set_t participant_uuids;
-		LLVoiceClient::getInstance()->getParticipantsUUIDSet(participant_uuids);
+		LLVoiceClient::getInstance()->getParticipantList(participant_uuids);
 
 
 		// check whether Avaline caller exists among voice participants
@@ -558,9 +558,8 @@ void LLParticipantList::addAvatarIDExceptAgent(const LLUUID& avatar_id)
 	}
 	else
 	{
-		LLVoiceClient::participantState *participant = LLVoiceClient::getInstance()->findParticipantByID(avatar_id);
-
-		mAvatarList->addAvalineItem(avatar_id, mSpeakerMgr->getSessionID(), participant ? participant->mAccountName : LLTrans::getString("AvatarNameWaiting"));
+		std::string display_name = LLVoiceClient::getInstance()->getDisplayName(avatar_id);
+		mAvatarList->addAvalineItem(avatar_id, mSpeakerMgr->getSessionID(), display_name.empty() ? display_name : LLTrans::getString("AvatarNameWaiting"));
 		mAvalineUpdater->watchAvalineCaller(avatar_id);
 	}
 	adjustParticipant(avatar_id);
@@ -674,12 +673,10 @@ void LLParticipantList::LLParticipantListMenu::show(LLView* spawning_view, const
 	if (is_muted)
 	{
 		LLMenuGL::sMenuContainer->childSetVisible("ModerateVoiceMuteSelected", false);
-		LLMenuGL::sMenuContainer->childSetVisible("ModerateVoiceMuteOthers", false);
 	}
 	else
 	{
 		LLMenuGL::sMenuContainer->childSetVisible("ModerateVoiceUnMuteSelected", false);
-		LLMenuGL::sMenuContainer->childSetVisible("ModerateVoiceUnMuteOthers", false);
 	}
 }
 
@@ -784,16 +781,17 @@ void LLParticipantList::LLParticipantListMenu::moderateVoice(const LLSD& userdat
 	if (!gAgent.getRegion()) return;
 
 	bool moderate_selected = userdata.asString() == "selected";
-	const LLUUID& selected_avatar_id = mUUIDs.front();
-	bool is_muted = isMuted(selected_avatar_id);
 
 	if (moderate_selected)
 	{
+		const LLUUID& selected_avatar_id = mUUIDs.front();
+		bool is_muted = isMuted(selected_avatar_id);
 		moderateVoiceParticipant(selected_avatar_id, is_muted);
 	}
 	else
 	{
-		moderateVoiceOtherParticipants(selected_avatar_id, is_muted);
+		bool unmute_all = userdata.asString() == "unmute_all";
+		moderateVoiceOtherParticipants(LLUUID::null, unmute_all);
 	}
 }
 
@@ -855,7 +853,7 @@ bool LLParticipantList::LLParticipantListMenu::enableContextMenuItem(const LLSD&
 	else if (item == "can_call")
 	{
 		bool not_agent = mUUIDs.front() != gAgentID;
-		bool can_call = not_agent && LLVoiceClient::voiceEnabled() && LLVoiceClient::getInstance()->voiceWorking();
+		bool can_call = not_agent &&  LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking();
 		return can_call;
 	}