summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/notifications.xml
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-01-10 11:20:39 -0500
committerLoren Shih <seraph@lindenlab.com>2011-01-10 11:20:39 -0500
commitfdf19a526821291bd3d6a6e1f6b78dcaeac63705 (patch)
tree840aacb00347dade197ad74862fdec9be513749d /indra/newview/skins/default/xui/en/notifications.xml
parentc4989c17ed3848f676364e1927ccad13fb628e2c (diff)
parent964e981458234aed37252a7b484f6f6765fff50d (diff)
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml10
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6af49fdecf..e2fc173f7f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -253,6 +253,16 @@ Save all changes to clothing/body parts?
<notification
icon="alertmodal.tga"
+ name="FavoritesOnLogin"
+ type="alertmodal">
+ Note: When you turn on this option, anyone who uses this computer can see your list of favorite locations.
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
name="GrantModifyRights"
type="alertmodal">
Granting modify rights to another Resident allows them to change, delete or take ANY objects you may have in-world. Be VERY careful when handing out this permission.