diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-10-14 17:25:24 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-10-14 17:25:24 -0700 |
| commit | f6c7b906e1f1d1bcc56a1e71b1867a58c5b2381a (patch) | |
| tree | ec9226508d7a3e1555b774fde915a8b299b35cd7 /indra/newview/llvoiceclient.cpp | |
| parent | c2f5365f986aab49d5c7cfa2834a68f5b35c09c2 (diff) | |
| parent | 04b84ce07dd5bc8364f948ef0004e3dc5328f1b4 (diff) | |
Pull merge with lindenlab/viewer-bear
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
| -rwxr-xr-x | indra/newview/llvoiceclient.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index af55c8f741..815965fb0a 100755 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -113,8 +113,8 @@ LLVoiceClient::LLVoiceClient() : mVoiceModule(NULL), m_servicePump(NULL), - mVoiceEffectEnabled(LLCachedControl<bool>(gSavedSettings, "VoiceMorphingEnabled")), - mVoiceEffectDefault(LLCachedControl<std::string>(gSavedPerAccountSettings, "VoiceEffectDefault")), + mVoiceEffectEnabled(LLCachedControl<bool>(gSavedSettings, "VoiceMorphingEnabled", true)), + mVoiceEffectDefault(LLCachedControl<std::string>(gSavedPerAccountSettings, "VoiceEffectDefault", "00000000-0000-0000-0000-000000000000")), mPTTDirty(true), mPTT(true), mUsePTT(true), |