diff options
author | Lynx Linden <lynx@lindenlab.com> | 2009-12-10 09:20:33 +0000 |
---|---|---|
committer | Lynx Linden <lynx@lindenlab.com> | 2009-12-10 09:20:33 +0000 |
commit | 3497f64b12f0527f9922e3f09d380559b4e97d11 (patch) | |
tree | 3fa9ccc95cebe7f0f03ce9c5e5c1b1c5179071ad /indra/newview/skins/default/xui | |
parent | 562d343c47570731664b34507359c823cfcbd634 (diff) | |
parent | 363ee42d53bd3049df0d17f16e211fac6b73daf7 (diff) |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 17 |
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"> |