From 0b3099fbca36be1012ddaeaf1e6cd5673caa1aca Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Tue, 23 Mar 2010 14:45:01 +0000 Subject: Minimal fix for EXT-6508, restore voice volume when unmuting. Ignore incoming volume level of zero from SLVoice. (May also fix EXT-5625, though unconfirmed, removes obsolete hack that was obfuscating that issue). --- indra/newview/llvoiceclient.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'indra/newview/llvoiceclient.cpp') diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 5ba13efca2..9bb85d2bd5 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -4598,7 +4598,15 @@ void LLVoiceClient::participantUpdatedEvent( { participant->mPower = 0.0f; } - participant->mVolume = volume; + + // *HACK: Minimal hack to fix EXT-6508, ignore the incoming volume if it is zero. + // This happens because we send volume zero to Vivox when someone is muted, + // Vivox then send it back to us, overwriting the previous volume. + // Remove this hack once volume refactoring from EXT-6031 is applied. + if (volume != 0) + { + participant->mVolume = volume; + } // *HACK: mantipov: added while working on EXT-3544 -- cgit v1.2.3