summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-12-10 13:46:16 -0500
committerLoren Shih <seraph@lindenlab.com>2009-12-10 13:46:16 -0500
commit6215fa4c136b240025851a7b1c73c284c2f399e4 (patch)
tree4b7d56d3bf4fc7f10cc4f8734d4ae518bc389cb6 /indra/newview/skins
parent6b0c1f97f4c1c24d786d2d1a0171b883d21f447b (diff)
parent9b4d09471cca6922257a27ba9cb70498ab81fd94 (diff)
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml17
1 files changed, 17 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 3659db230c..416b1b6973 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5754,6 +5754,23 @@ You just entered a region using a different server version, which may affect per
The SLurl you clicked on is not supported.
</notification>
+ <notification
+ icon="notifytip.tga"
+ name="BlockedSLURL"
+ priority="high"
+ type="notifytip">
+A SLurl was received from an untrusted browser and has been blocked for your security.
+ </notification>
+
+ <notification
+ icon="notifytip.tga"
+ name="ThrottledSLURL"
+ priority="high"
+ type="notifytip">
+Multiple SLurls were received from an untrusted browser within a short period.
+They will be blocked for a few seconds for your security.
+ </notification>
+
<notification name="IMToast" type="notifytoast">
[MESSAGE]
<form name="form">