summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-08-02 19:36:11 +0800
committerErik Kundiman <erik@megapahit.org>2024-08-02 19:36:11 +0800
commitad9e004037349b75b992c142c1cbcff50765ba6c (patch)
tree7fc422ead94e01e1d2fd976366b9ca2cec0e8518 /indra/newview/skins/default
parent06e8f0c443c1ba7858d000c6d695b7e988e02053 (diff)
parent5f66a15142083a047ac945da94f167c24c95f49a (diff)
Merge remote-tracking branch 'secondlife/release/webrtc-voice' into webrtc-voice
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml6
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml1
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 0ccb980803..2403082938 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8837,10 +8837,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 daa49eaa2c..232586636b 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3820,6 +3820,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>