diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-01-04 20:28:01 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-01-04 20:28:01 -0800 |
| commit | fbc414c02b80da1c0c5c1ebbbbcb84958938be6e (patch) | |
| tree | 27a1ff7592fa9f9de9e0f3d228076c59174bdd41 /indra/newview/skins/default/xui/en/notifications.xml | |
| parent | 12554bffb34895533ed11013a780bfa088756a67 (diff) | |
| parent | 39ff545bab2c1e05b7b9fe14ee99828795f1f78f (diff) | |
Merge with viewer-chui
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 94307d2f93..05798da8e2 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3696,7 +3696,6 @@ Do Not Disturb is on. You will not be notified of incoming communications. - Other residents will receive your Do Not Disturb response (set in Preferences > General). - Teleportation offers will be declined. - Voice calls will be rejected. -- Inventory offers will go to your Trash. <usetemplate ignoretext="I change my status to Do Not Disturb mode" name="okignore" @@ -6584,7 +6583,7 @@ However, this region contains content accessible to adults only. log_to_im="true" log_to_chat="false" show_toast="false" - type="offer"> + type="notify"> Teleport offer sent to [TO_NAME] </notification> @@ -6637,7 +6636,7 @@ However, this region contains content accessible to adults only. name="FriendshipOffered" log_to_im="true" show_toast="false" - type="offer"> + type="notify"> <tag>friendship</tag> You have offered friendship to [TO_NAME] </notification> @@ -6667,7 +6666,7 @@ However, this region contains content accessible to adults only. icon="notify.tga" name="FriendshipAccepted" log_to_im="true" - type="offer"> + type="notify"> <tag>friendship</tag> <nolink>[NAME]</nolink> accepted your friendship offer. </notification> @@ -6687,7 +6686,7 @@ However, this region contains content accessible to adults only. name="FriendshipAcceptedByMe" log_to_im="true" show_toast="false" - type="offer"> + type="notify"> <tag>friendship</tag> Friendship offer accepted. </notification> @@ -6697,7 +6696,7 @@ Friendship offer accepted. name="FriendshipDeclinedByMe" log_to_im="true" show_toast="false" - type="offer"> + type="notify"> <tag>friendship</tag> Friendship offer declined. </notification> |