summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-06-29 09:50:48 -0400
committerOz Linden <oz@lindenlab.com>2011-06-29 09:50:48 -0400
commit6b7cba66e303353dcb0eb2b744ccfc6ee3ec11ae (patch)
treeb9f80acb6548c18da3331d718eb65b75b210f387 /indra/newview/skins/default/xui
parent04fbb862ddb5871774435b4c4988193731b62a88 (diff)
parentfae829c8eface8cf356b63cbb82587d6950bdd79 (diff)
merge changes for storm-1439
Diffstat (limited to 'indra/newview/skins/default/xui')
-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 09105c1d28..db1cee5d08 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?