summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2016-10-25 20:09:42 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2016-10-25 20:09:42 +0300
commitd4373437f2bb80579b0a2c984d30d041e0c6d156 (patch)
tree206bf0c87dc042bbbe7b6b6b83610041e49b5740 /indra/newview/skins
parent29dd0298af63c47a4c40eccb90011fd5ed48295b (diff)
parent6b1f96187d7a93a4bbaecf1a84162a141eed5971 (diff)
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/newview/skins')
-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 bc8166fcce..65ab3f001f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -10275,6 +10275,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>