diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 16:50:21 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 16:50:21 -0800 |
| commit | 5ed6e0720af1b6cdf1a983e2c040eeb5d8ae33ba (patch) | |
| tree | 5d0141f43cfaf59e5cb62eb2f4ca9541160e6173 /indra/newview/skins/default/xui/en/notifications.xml | |
| parent | 3ab4b0f58326a01a09aa99f262c03d2703215af2 (diff) | |
| parent | 6e932911d5b0a02b44caf3bf81a9c00fd0e1dc89 (diff) | |
warn-on-failure:unix-eol
automated merge from trunk
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index b31653d44d..7546d86313 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -244,6 +244,16 @@ Save all changes to clothing/body parts? <notification icon="alertmodal.tga" + name="FriendsAndGroupsOnly" + type="alertmodal"> + Non-friends won't know that you've choosen to ignore their calls and instant messages. + <usetemplate + name="okbutton" + yestext="Yes"/> + </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. @@ -3141,7 +3151,7 @@ Join me in [REGION] icon="alertmodal.tga" name="TeleportFromLandmark" type="alertmodal"> -Are you sure you want to teleport? +Are you sure you want to teleport to [LOCATION]? <usetemplate ignoretext="Confirm that I want to teleport to a landmark" name="okcancelignore" |