diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-04-19 16:24:05 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-04-19 16:24:05 -0700 |
| commit | 8d8f167a4e58583c55901448a7bc5dd88b60e5f7 (patch) | |
| tree | b4c71519c8d9ae0fd1addece5ea1f1424ded313f /indra/newview/llinspectavatar.cpp | |
| parent | 7f0a7789903809d489e9f85575be18c88df1ea98 (diff) | |
| parent | b55bce5b1b74c612f3a411889df1e0fb57bc3264 (diff) | |
automated merge with trunk
Diffstat (limited to 'indra/newview/llinspectavatar.cpp')
| -rw-r--r-- | indra/newview/llinspectavatar.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp index 94ea236757..1299324105 100644 --- a/indra/newview/llinspectavatar.cpp +++ b/indra/newview/llinspectavatar.cpp @@ -536,8 +536,7 @@ void LLInspectAvatar::toggleSelectedVoice(bool enabled) void LLInspectAvatar::updateVolumeSlider() { - - bool voice_enabled = gVoiceClient->getVoiceEnabled(mAvatarID); + bool voice_enabled = LLVoiceClient::getInstance()->getVoiceEnabled(mAvatarID); // Do not display volume slider and mute button if it // is ourself or we are not in a voice channel together @@ -567,6 +566,7 @@ void LLInspectAvatar::updateVolumeSlider() volume_slider->setEnabled( !is_muted ); F32 volume; + if (is_muted) { // it's clearer to display their volume as zero @@ -575,7 +575,7 @@ void LLInspectAvatar::updateVolumeSlider() else { // actual volume - volume = gVoiceClient->getUserVolume(mAvatarID); + volume = LLVoiceClient::getInstance()->getUserVolume(mAvatarID); } volume_slider->setValue( (F64)volume ); } @@ -604,7 +604,7 @@ void LLInspectAvatar::onClickMuteVolume() void LLInspectAvatar::onVolumeChange(const LLSD& data) { F32 volume = (F32)data.asReal(); - gVoiceClient->setUserVolume(mAvatarID, volume); + LLVoiceClient::getInstance()->setUserVolume(mAvatarID, volume); } void LLInspectAvatar::nameUpdatedCallback( |