diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-03-23 14:45:01 +0000 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-03-23 14:45:01 +0000 |
| commit | 0b3099fbca36be1012ddaeaf1e6cd5673caa1aca (patch) | |
| tree | eed9eed46758a16bc73c791b3f337780cf1e8d4f | |
| parent | af77b7713444b9df58f451bdb1f30bdd4754fcbf (diff) | |
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).
| -rw-r--r-- | indra/newview/llinspectavatar.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp index 14bc4376fe..35cb9b3468 100644 --- a/indra/newview/llinspectavatar.cpp +++ b/indra/newview/llinspectavatar.cpp @@ -564,7 +564,6 @@ void LLInspectAvatar::updateVolumeSlider() LLUICtrl* volume_slider = getChild<LLUICtrl>("volume_slider"); volume_slider->setEnabled( !is_muted ); - const F32 DEFAULT_VOLUME = 0.5f; F32 volume; if (is_muted) { @@ -575,13 +574,6 @@ void LLInspectAvatar::updateVolumeSlider() { // actual volume volume = gVoiceClient->getUserVolume(mAvatarID); - - // *HACK: Voice client doesn't have any data until user actually - // says something. - if (volume == 0.f) - { - volume = DEFAULT_VOLUME; - } } volume_slider->setValue( (F64)volume ); } 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 |