diff options
author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-19 17:54:34 -0800 |
---|---|---|
committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-19 17:54:34 -0800 |
commit | 2feff5fe7495dddbaa7878d4e804ad2bea149971 (patch) | |
tree | 9549675869d4e7d0807504f294fd4a763b9bb95f /indra/newview/skins | |
parent | cc900b732dd1af2790248485a270197a4006e0f7 (diff) | |
parent | b15ba74485e24db9a996a2f6a9438ac48224ea7a (diff) |
merging in latest changes
Diffstat (limited to 'indra/newview/skins')
-rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 35ce787847..05798da8e2 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6583,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> @@ -6636,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> @@ -6666,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> @@ -6686,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> @@ -6696,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> |