diff options
| author | Roxanne Skelly <roxie@lindenlab.com> | 2024-07-03 10:25:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-03 10:25:57 -0700 |
| commit | f702a8f14ab86fe767d35cf56f4f8e12baf3dbff (patch) | |
| tree | 6a878357546083eab6c99f8c64af21bdc709c465 /indra/newview/llvoiceclient.cpp | |
| parent | 9bc3dfbdeaba904999880f6b59306128c98469e8 (diff) | |
| parent | 3c71230aa4569f1c238a5f645b5a5b7447ec389e (diff) | |
Merge pull request #1915 from secondlife/roxie/webrtc-voice-disable-morphing
EnableVoiceMorphing should default to true
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
| -rw-r--r-- | 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 779f4e3176..490c7174c5 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -137,7 +137,7 @@ LLVoiceClient::LLVoiceClient(LLPumpIO *pump) mSpatialVoiceModule(NULL), mNonSpatialVoiceModule(NULL), m_servicePump(NULL), - mVoiceEffectEnabled(LLCachedControl<bool>(gSavedSettings, "VoiceMorphingEnabled", false)), + mVoiceEffectEnabled(LLCachedControl<bool>(gSavedSettings, "VoiceMorphingEnabled", true)), mVoiceEffectDefault(LLCachedControl<std::string>(gSavedPerAccountSettings, "VoiceEffectDefault", "00000000-0000-0000-0000-000000000000")), mVoiceEffectSupportNotified(false), mPTTDirty(true), @@ -577,7 +577,7 @@ bool LLVoiceClient::onVoiceEffectsNotSupported(const LLSD ¬ification, const L switch (option) { case 0: // "Okay" - gSavedSettings.setBOOL("VoiceMorphingEnabled", FALSE); + gSavedPerAccountSettings.setString("VoiceEffectDefault", LLUUID::null.asString()); break; case 1: // "Cancel" |