livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix another build break on linux

meow-7.2.2
Roxie Linden 2010-05-04 20:15:50 -07:00
parent 8555c40969
commit 60805b6f20
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llvoicevivox.cpp
View File

@ -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)