summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2016-10-17 15:48:14 -0700
committerRider Linden <rider@lindenlab.com>2016-10-17 15:48:14 -0700
commit826afcaf387ad0d589ac5ea1305dec9d04a22139 (patch)
tree0354d7ac52434ba88eb81cd644a58ab8d9035682 /indra
parentc50cb47f1b78cb9880a34fe8184bd9d0fd7e0e7d (diff)
parent391ae4dee49b5bc9ced631a67a5e9189a6c88138 (diff)
Merge
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml16
1 files changed, 16 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5c896b8511..804235518e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -10262,6 +10262,22 @@ You have been teleported by the object '[OBJECT_NAME]' owned by an unknown user.
<notification
icon="alertmodal.tga"
+ name="StandDeniedByObject"
+ type="notify">
+ <tag>fail</tag>
+'[OBJECT_NAME]' will not allow you to stand at this time.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="ResitDeniedByObject"
+ type="notify">
+ <tag>fail</tag>
+'[OBJECT_NAME]' will not allow you to change your seat at this time.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
name="CantCreateObjectRegionFull"
type="notify">
<tag>fail</tag>