summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/notifications.xml
diff options
context:
space:
mode:
authorcallum_linden <none@none>2018-02-14 10:56:31 -0800
committercallum_linden <none@none>2018-02-14 10:56:31 -0800
commit08cb3fbe32b62ed3f53f68633ada9eab44dccb0b (patch)
treecaa4327b04a438978fd9bae207ea86269f1525b6 /indra/newview/skins/default/xui/en/notifications.xml
parentb2eb85df79f317d2b587c969178cea9b96c81213 (diff)
parent5510b589b136d354ce2975c45f41ccc7e66e9d21 (diff)
Automated merge with tip of viewer-release
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml21
1 files changed, 8 insertions, 13 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index a0130b568a..9e4cb4e267 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8094,17 +8094,6 @@ Failed to connect to [VOICE_CHANNEL_NAME], please try again later. You will now
</notification>
<notification
- duration="10"
- icon="notifytip.tga"
- name="VoiceLoginRetry"
- type="notifytip">
- <unique/>
-We are creating a voice channel for you. This may take up to one minute.
- <tag>status</tag>
- <tag>voice</tag>
- </notification>
-
- <notification
icon="notify.tga"
name="VoiceEffectsExpired"
sound="UISndAlert"
@@ -8559,12 +8548,18 @@ Please check your network and firewall setup.
icon="alertmodal.tga"
name="NoVoiceConnect"
type="alertmodal">
-We're having trouble connecting to your voice server:
+We are unable to connect to the voice server:
[HOSTID]
-Voice communications will not be available.
+Ports that must be allowed for voice are:
+:TCP: 80, 443
+:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000
+
Please check your network and firewall setup.
+Disable any SIP ALG feature in your router.
+
+Voice communications will not be available.
<tag>voice</tag>
<tag>fail</tag>
<usetemplate