diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-04-29 15:28:21 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-04-29 15:28:21 +0300 |
| commit | 5f397bdd1831b1be593982ca8fc88dbe1a0cad07 (patch) | |
| tree | 1d0b8a8973a30bf3c65f09da653b0e7c009053fd /indra/newview/llvoicevivox.cpp | |
| parent | 1382e9bae647d6b548cd9a1fc78339e5929ea202 (diff) | |
| parent | fde0868231a25b8c9ce03a86cb53f1738d35688d (diff) | |
Merge from viewer-release
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
| -rwxr-xr-x | indra/newview/llvoicevivox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index b6aecb4aaa..a6a7a35b03 100755 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -2519,7 +2519,7 @@ void LLVivoxVoiceClient::sendPositionalUpdate(void) if(!p->mIsSelf) { // scale from the range 0.0-1.0 to vivox volume in the range 0-100 - S32 volume = llround(p->mVolume / VOLUME_SCALE_VIVOX); + S32 volume = ll_round(p->mVolume / VOLUME_SCALE_VIVOX); bool mute = p->mOnMuteList; if(mute) |