diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-07-24 16:55:49 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-07-24 16:55:49 -0700 |
| commit | ed73208eb96b862b97fa285036edea1e792ca3c6 (patch) | |
| tree | ce764121e934df19c0da19923ba75bbc715dd93a /indra/newview/skins/default/xui/en | |
| parent | 3e4b23539c2b8dfc0e07256f350f4ca0f232f756 (diff) | |
| parent | aced6fe5dadae40eed700cff42936a6d227d7837 (diff) | |
Merge remote-tracking branch 'origin/release/webrtc-voice' into release/2024.06-atlasaurus
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index f86b297395..73b001a526 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -8848,10 +8848,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> |