summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/notifications.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-06-29 12:10:03 -0400
committerOz Linden <oz@lindenlab.com>2011-06-29 12:10:03 -0400
commit290423764dc48e70205cc0d28187d9d8fe3c8dff (patch)
tree89a5814cb8aa25d1ead942b5e0221df5e7e832fe /indra/newview/skins/default/xui/en/notifications.xml
parentb5be90d0d2f26792f0044286f9b64126446dc101 (diff)
parenta300902494f76b9542c3978c2ca80726cefbc942 (diff)
merge out latest viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
-rwxr-xr-xindra/newview/skins/default/xui/en/notifications.xml13
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 2ba9c1d7cd..60ab4d2bc5 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3698,6 +3698,19 @@ Join me in [REGION]
<notification
icon="alertmodal.tga"
+ name="TooManyTeleportOffers"
+ type="alertmodal">
+You attempted to make [OFFERS] teleport offers
+which exceeds the limit of [LIMIT].
+ <tag>group</tag>
+ <tag>fail</tag>
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
name="OfferTeleportFromGod"
type="alertmodal">
God summon Resident to your location?