summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/notifications.xml
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2014-07-08 17:29:48 -0400
committerMonty Brandenberg <monty@lindenlab.com>2014-07-08 17:29:48 -0400
commit29bea5a6b94458e23559bdbeaae5a593100533b6 (patch)
tree5bd356450afd8da159542bfd444b653442004a45 /indra/newview/skins/default/xui/en/notifications.xml
parent053f436413c01e237accabace4dc5ff1eccca837 (diff)
parent226929f8f5b8bc1080d0082b2595d689238df2b8 (diff)
Merge. Refresh from viewer-release after 3.7.11 release.
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
-rwxr-xr-xindra/newview/skins/default/xui/en/notifications.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index bea291da91..f49f300868 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -10250,6 +10250,17 @@ Cannot create large prims that intersect other players. Please re-try when othe
name="okignore"
yestext="OK"/>
</notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="DefaultObjectPermissions"
+ type="alert">
+ There was a problem saving the default permissions due to the following reason: [REASON]. Please try setting the default permissions later.
+ <tag>fail</tag>
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
+ </notification>
<notification
icon="alert.tga"