diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-05 20:38:09 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-05 20:38:09 +0800 |
| commit | 4b188e3db3800b96688be928e4020e87a1bb9aca (patch) | |
| tree | b02aff4e18e08ae464b5bbb4359eabbaf762e966 /indra/newview/llvoiceclient.cpp | |
| parent | be75d0eba7ff0a29573139aee593debba81cc65d (diff) | |
| parent | 162bb33e15fc9a5bf8dcdddd988dc93fcfb317bd (diff) | |
Merge remote-tracking branch 'secondlife/release/webrtc-voice' into webrtc-voice
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" |