summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/notifications.xml
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml23
1 files changed, 9 insertions, 14 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index a0130b568a..6aa6653f42 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5928,7 +5928,7 @@ The folder '[FOLDERNAME]' is a system folder. Deleting system folders
icon="alertmodal.tga"
name="ConfirmEmptyTrash"
type="alertmodal">
-[COUNT] items will be permanently deleted. Are you sure you want to permanently delete the contents of your Trash?
+[COUNT] items and folders will be permanently deleted. Are you sure you want to permanently delete the contents of your Trash?
<tag>confirm</tag>
<usetemplate
name="okcancelbuttons"
@@ -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