diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-07-17 14:31:09 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-07-17 14:31:09 -0700 |
| commit | b054f8db0cdb48b3c235105eb262d5b08087b429 (patch) | |
| tree | 5bb0eb0c5807d19b0bb21f48e180d4e06beee352 /indra/newview | |
| parent | 781cbae21bb56023e0a24fee22bba2c72b0347c2 (diff) | |
| parent | 162bb33e15fc9a5bf8dcdddd988dc93fcfb317bd (diff) | |
Merge remote-tracking branch 'origin/release/webrtc-voice' into develop
# Conflicts:
# autobuild.xml
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 4190719504..235d294849 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13122,7 +13122,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>AutoDisengageMic</key> <map> diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 67f41b2733..891c9383bf 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" diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index fcb8a0a4f2..060e1243ab 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -2540,7 +2540,6 @@ void LLVivoxVoiceClient::sessionCreateSendMessage(const sessionStatePtr_t &sessi stream << "<ConnectAudio>" << (startAudio?"true":"false") << "</ConnectAudio>" << "<ConnectText>" << (startText?"true":"false") << "</ConnectText>" - << "<VoiceFontID>" << font_index << "</VoiceFontID>" << "<Name>" << mChannelName << "</Name>" << "</Request>\n\n\n"; LL_WARNS("Voice") << "Session.Create: " << stream.str() << LL_ENDL; @@ -2579,7 +2578,6 @@ void LLVivoxVoiceClient::sessionGroupAddSessionSendMessage(const sessionStatePtr << "<Name>" << mChannelName << "</Name>" << "<ConnectAudio>" << (startAudio?"true":"false") << "</ConnectAudio>" << "<ConnectText>" << (startText?"true":"false") << "</ConnectText>" - << "<VoiceFontID>" << font_index << "</VoiceFontID>" << "<Password>" << password << "</Password>" << "<PasswordHashAlgorithm>SHA1UserName</PasswordHashAlgorithm>" << "</Request>\n\n\n" @@ -2603,7 +2601,6 @@ void LLVivoxVoiceClient::sessionMediaConnectSendMessage(const sessionStatePtr_t << "<Request requestId=\"" << session->mHandle << "\" action=\"Session.MediaConnect.1\">" << "<SessionGroupHandle>" << session->mGroupHandle << "</SessionGroupHandle>" << "<SessionHandle>" << session->mHandle << "</SessionHandle>" - << "<VoiceFontID>" << font_index << "</VoiceFontID>" << "<Media>Audio</Media>" << "</Request>\n\n\n"; |