summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorAndrew A. de Laix <alain@lindenlab.com>2011-06-20 15:48:08 -0700
committerAndrew A. de Laix <alain@lindenlab.com>2011-06-20 15:48:08 -0700
commit7b33ae4456c4d66770aa2df86094db57f25505f8 (patch)
tree578d851b0525ce0da5adfcfd5c5f7b314f56780f /indra/newview/skins/default
parent7f6d49df43c660b9f5632ffb8a30f90ee718cac0 (diff)
parent0fb93246b36b356362e1899eab2d67c8931d9471 (diff)
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/skins/default')
-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?