diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-03-01 15:31:04 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-01 15:31:04 -0800 |
| commit | b11a625e6ff89470d25273fa426ed13f7abc4a6a (patch) | |
| tree | a5e923a8211926f119f1cf45ded6cd4222c9250b /indra/newview/llvieweraudio.cpp | |
| parent | 6575b685e91d334198789c88dec2efab7e5a1ac9 (diff) | |
| parent | a2efe4bb4154b7ecb9c7cb279f7a28d7d401a93a (diff) | |
Automated merge with a few fixups for code review comments
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 1d935f5ab8..2b45ccac8e 100644 --- a/indra/newview/llvieweraudio.cpp +++ b/indra/newview/llvieweraudio.cpp @@ -156,21 +156,21 @@ void audio_update_volume(bool force_update) LLViewerMedia::setVolume( media_muted ? 0.0f : media_volume ); // Voice - if (gVoiceClient) + if (LLVoiceClient::getInstance()) { F32 voice_volume = gSavedSettings.getF32("AudioLevelVoice"); voice_volume = mute_volume * master_volume * voice_volume; BOOL voice_mute = gSavedSettings.getBOOL("MuteVoice"); - gVoiceClient->setVoiceVolume(voice_mute ? 0.f : voice_volume); - gVoiceClient->setMicGain(voice_mute ? 0.f : gSavedSettings.getF32("AudioLevelMic")); + LLVoiceClient::getInstance()->setVoiceVolume(voice_mute ? 0.f : voice_volume); + LLVoiceClient::getInstance()->setMicGain(voice_mute ? 0.f : gSavedSettings.getF32("AudioLevelMic")); if (!gViewerWindow->getActive() && (gSavedSettings.getBOOL("MuteWhenMinimized"))) { - gVoiceClient->setMuteMic(true); + LLVoiceClient::getInstance()->setMuteMic(true); } else { - gVoiceClient->setMuteMic(false); + LLVoiceClient::getInstance()->setMuteMic(false); } } } |