summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorAndrew A. de Laix <alain@lindenlab.com>2011-06-15 09:25:40 -0700
committerAndrew A. de Laix <alain@lindenlab.com>2011-06-15 09:25:40 -0700
commit92a47165be54de4dd6bf42bc9472d2fc54f7169e (patch)
tree8eeeae9135a4e6946cc1ea6fabc51114481fee0a /indra/newview/skins/default/xui
parent735c0dbc5ff731aad95227a940ef8b09a4a9e77d (diff)
parent6f1fabf0e09662a2d0467fcc487ff6189fc5133c (diff)
Automated merge with https://bitbucket.org/alain_linden/viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/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 ce96c488b4..21680772ba 100644
--- 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;
+250 are the most that can be done at one time
+ <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?