diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-05-04 20:15:50 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-05-04 20:15:50 -0700 |
| commit | 60805b6f202b90b86d90d96eb7d09ae3355343eb (patch) | |
| tree | 9c2e7d3f36ead2a581c9c60d13b824696ba931cd | |
| parent | 8555c40969ec2258ff9389fd0430dcfff484e94a (diff) | |
Fix another build break on linux
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 81758eae48..bcb1a70efb 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -2498,21 +2498,6 @@ void LLVivoxVoiceClient::sendPositionalUpdate(void) S32 volume = llround(p->mVolume / VOLUME_SCALE_VIVOX); bool mute = p->mOnMuteList; - if(p->mUserVolume != -1) - { - // scale from user volume in the range 0-400 (with 100 as "normal") to vivox volume in the range 0-100 (with 56 as "normal") - if(p->mUserVolume < 100) - volume = (p->mUserVolume * 56) / 100; - else - volume = (((p->mUserVolume - 100) * (100 - 56)) / 300) + 56; - } - else if(p->mVolume != -1) - { - // Use the previously reported internal volume (comes in with a ParticipantUpdatedEvent) - volume = p->mVolume; - } - - if(mute) { // SetParticipantMuteForMe doesn't work in p2p sessions. @@ -4098,7 +4083,6 @@ LLVivoxVoiceClient::participantState::participantState(const std::string &uri) : mPower(0.f), mVolume(LLVoiceClient::VOLUME_DEFAULT), mOnMuteList(false), - mUserVolume(-1), mVolumeDirty(false), mAvatarIDValid(false), mIsSelf(false) |