Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

Browse Source 
Conflicts:
	indra/newview/lloverlaybar.cpp - Shyotl did some caching, VoiceUpdate turned LLVoiceClient::voiceEnabled non-static.
	indra/newview/llvoiceclient.cpp - Change actually belongs in llvoicevivox.cpp
This commit is contained in:
Lirusaito
2013-06-26 04:43:46 -04:00
parent 139a10e77c 84d76f437f
commit 32dc35d582
5 changed files with 57 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llvoicevivox.cpp
View File

@@ -5320,7 +5320,9 @@ void LLVivoxVoiceClient::setVoiceEnabled(bool enabled)
bool LLVivoxVoiceClient::voiceEnabled()
{
return gSavedSettings.getBOOL("EnableVoiceChat") && !gSavedSettings.getBOOL("CmdLineDisableVoice");
static const LLCachedControl<bool> enable_voice_chat("EnableVoiceChat",true);
static const LLCachedControl<bool> cmdline_disable_voice("CmdLineDisableVoice",false);
return enable_voice_chat && !cmdline_disable_voice;
}
void LLVivoxVoiceClient::setLipSyncEnabled(BOOL enabled)