diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-07 10:37:07 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-07 10:37:07 +0100 |
commit | 0bb3f144c0a6712a269246975635962b3b5f48d0 (patch) | |
tree | ba6c371a3c40f878d20eccac7065ac11a4a51f1d /indra/newview/llvieweraudio.cpp | |
parent | 9523c70f9dd3b2db21f6578bbb2b1da6873004ea (diff) |
Backed out changeset 63b699f90efd
Diffstat (limited to 'indra/newview/llvieweraudio.cpp')
-rw-r--r-- | indra/newview/llvieweraudio.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llvieweraudio.cpp b/indra/newview/llvieweraudio.cpp index ef6f4194e0..2661c9f32b 100644 --- a/indra/newview/llvieweraudio.cpp +++ b/indra/newview/llvieweraudio.cpp @@ -157,21 +157,21 @@ void audio_update_volume(bool force_update) LLViewerMedia::setVolume( media_muted ? 0.0f : media_volume ); // Voice - if (LLVoiceClient::getInstance()) + if (gVoiceClient) { F32 voice_volume = gSavedSettings.getF32("AudioLevelVoice"); voice_volume = mute_volume * master_volume * voice_volume; BOOL voice_mute = gSavedSettings.getBOOL("MuteVoice"); - LLVoiceClient::getInstance()->setVoiceVolume(voice_mute ? 0.f : voice_volume); - LLVoiceClient::getInstance()->setMicGain(voice_mute ? 0.f : gSavedSettings.getF32("AudioLevelMic")); + gVoiceClient->setVoiceVolume(voice_mute ? 0.f : voice_volume); + gVoiceClient->setMicGain(voice_mute ? 0.f : gSavedSettings.getF32("AudioLevelMic")); if (!gViewerWindow->getActive() && (gSavedSettings.getBOOL("MuteWhenMinimized"))) { - LLVoiceClient::getInstance()->setMuteMic(true); + gVoiceClient->setMuteMic(true); } else { - LLVoiceClient::getInstance()->setMuteMic(false); + gVoiceClient->setMuteMic(false); } } } |