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

SL-11865 Fixed weird existance check

master
andreykproductengine 2019-09-04 16:32:54 +03:00
parent e439f0366f
commit 05dee4c10b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llvieweraudio.cpp
View File

@ -465,22 +465,23 @@ void audio_update_volume(bool force_update)
media_volume = mute_volume * master_volume * media_volume;
LLViewerMedia::getInstance()->setVolume( media_muted ? 0.0f : media_volume );
// Voice
if (LLVoiceClient::getInstance())
// Voice, this is parametric singleton, it gets initialized when ready
if (LLVoiceClient::instanceExists())
{
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"));
LLVoiceClient *voice_inst = LLVoiceClient::getInstance();
voice_inst->setVoiceVolume(voice_mute ? 0.f : voice_volume);
voice_inst->setMicGain(voice_mute ? 0.f : gSavedSettings.getF32("AudioLevelMic"));
if (!gViewerWindow->getActive() && (gSavedSettings.getBOOL("MuteWhenMinimized")))
{
LLVoiceClient::getInstance()->setMuteMic(true);
voice_inst->setMuteMic(true);
}
else
{
LLVoiceClient::getInstance()->setMuteMic(false);
voice_inst->setMuteMic(false);
}
}
}