diff options
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 10dea0e715..bba9fe1ccf 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -833,6 +833,7 @@ LLVoiceClient::LLVoiceClient() setCaptureDevice(captureDevice); std::string renderDevice = gSavedSettings.getString("VoiceOutputAudioDevice"); setRenderDevice(renderDevice); + mLipSyncEnabled = gSavedSettings.getU32("LipSyncEnabled"); mTuningMode = false; mTuningEnergy = 0.0f; @@ -3607,6 +3608,24 @@ bool LLVoiceClient::voiceEnabled() return gSavedSettings.getBOOL("EnableVoiceChat") && !gSavedSettings.getBOOL("CmdLineDisableVoice"); } +void LLVoiceClient::setLipSyncEnabled(U32 enabled) +{ + mLipSyncEnabled = enabled; +} + +U32 LLVoiceClient::lipSyncEnabled() +{ + + if ( mVoiceEnabled && stateDisabled != getState() ) + { + return mLipSyncEnabled; + } + else + { + return 0; + } +} + void LLVoiceClient::setUsePTT(bool usePTT) { if(usePTT && !mUsePTT) |