diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-03-29 16:24:58 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-29 16:24:58 -0700 |
| commit | 86dc5bce1a6fdde1238fea97ca1f6f8acb862184 (patch) | |
| tree | 35ab8edbc364a05a5d29d343f63b22e01ea5cb38 /indra/newview/llvoicevivox.cpp | |
| parent | 3fca923949667d1c713119043cd4aaeae4acfe09 (diff) | |
| parent | 8654ba5e2571e07c8d2fd898027abf6f85777905 (diff) | |
Automated merge
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index e4e3b23ea6..d7c2939b93 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -3670,7 +3670,16 @@ void LLVivoxVoiceClient::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 /* |