summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/notifications.xml
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2011-06-30 19:24:39 -0400
committerLogan Dethrow <log@lindenlab.com>2011-06-30 19:24:39 -0400
commitaec182e3dbc2e4c492167fc250583b9de5ec43f8 (patch)
treec4a56b20693ac7ee4a203d0bd58a5992fdce66b8 /indra/newview/skins/default/xui/en/notifications.xml
parent73afcff635f3d25432167ca43ab0b82aadd6c687 (diff)
parentf07173a9689237bf2d8218600c15d6bf4d047cdc (diff)
Merge
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
-rw-r--r--[-rwxr-xr-x]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 7bf742d949..cd0dc719bb 100755..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
+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?