diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-07-24 16:56:43 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-07-24 16:56:43 -0700 |
| commit | 93dc0f4e5c27803ab636132c8295d127a3a9a0b0 (patch) | |
| tree | 445b8e87a9d1c43d93c54633600b6f1c6cc59cd3 | |
| parent | 603f448393d43cb1fc67083b40c950a1d03fa4a6 (diff) | |
| parent | ed73208eb96b862b97fa285036edea1e792ca3c6 (diff) | |
Merge branch 'release/2024.06-atlasaurus' into develop
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 1 |
3 files changed, 10 insertions, 4 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 891c9383bf..4b299a51f5 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -37,6 +37,7 @@ #include "llui.h" #include "llkeyboard.h" #include "llagent.h" +#include "lltrans.h" #include "lluiusage.h" const F32 LLVoiceClient::OVERDRIVEN_POWER_LEVEL = 0.7f; @@ -597,7 +598,11 @@ bool LLVoiceClient::voiceEnabled() bool enabled = enable_voice_chat && !cmd_line_disable_voice && !gNonInteractive; if (enabled && !mVoiceEffectSupportNotified && getVoiceEffectEnabled() && !getVoiceEffectDefault().isNull()) { - LLNotificationsUtil::add("VoiceEffectsNotSupported", LLSD(), LLSD(), &LLVoiceClient::onVoiceEffectsNotSupported); + static const LLSD args = llsd::map( + "FAQ_URL", LLTrans::getString("no_voice_morphing_faq_url") + ); + + LLNotificationsUtil::add("VoiceEffectsNotSupported", args, LLSD(), &LLVoiceClient::onVoiceEffectsNotSupported); mVoiceEffectSupportNotified = true; } return enabled; diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 2c19a89fb2..2e08f6b3be 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -8871,10 +8871,10 @@ New Voice Morphs are available! persist="true" type="alertmodal"> Voice Morphs are not supported by this viewer. +For more information about other voice morph tools, see [[FAQ_URL] this article]. <usetemplate - notext="Cancel" - name="okcancelbuttons" - yestext="Disable Voice Morphing"/> + name="okignore" + yestext="OK"/> <tag>voice</tag> </notification> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index bee58da6b0..2d04b3e0fe 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3818,6 +3818,7 @@ Please reinstall viewer from https://secondlife.com/support/downloads/ and cont <string name="voice_morphing_url">https://secondlife.com/destination/voice-island</string> <string name="premium_voice_morphing_url">https://secondlife.com/destination/voice-morphing-premium</string> + <string name="no_voice_morphing_faq_url">https://lindenlab.freshdesk.com/support/solutions/articles/31000173560-webrtc-update-for-voice-chat-faq/</string> <string name="lindenhomes_get_home_url">https://secondlife.com/land/lindenhomes/member.php</string> <string name="lindenhomes_my_home_url">https://land.secondlife.com/en-Us/lindenhomes/my-home.php</string> |