diff options
| author | Chuck Linden <chuck@lindenlab.com> | 2010-02-19 14:32:55 -0500 |
|---|---|---|
| committer | Chuck Linden <chuck@lindenlab.com> | 2010-02-19 14:32:55 -0500 |
| commit | 9aee0cfa716736659af777c9fccd60b8618dc9d4 (patch) | |
| tree | bd6f329c88fc27fb697f6660d9eb51bcb14b9585 /indra/newview/skins/default/xui/en/notifications.xml | |
| parent | cd9a2a6a4ab8d1d989110908a3702ba34d1f6168 (diff) | |
| parent | 65f8b95ae8e93c3b946e43eea89bcb631723ca6c (diff) | |
Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfix
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 9c6b18ef27..4fa5d965c8 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -4310,14 +4310,14 @@ Topic: [SUBJECT], Message: [MESSAGE] icon="notifytip.tga" name="FriendOnline" type="notifytip"> -[NAME_SLURL] is Online +[FIRST] [LAST] is Online </notification> <notification icon="notifytip.tga" name="FriendOffline" type="notifytip"> -[NAME_SLURL] is Offline +[FIRST] [LAST] is Offline </notification> <notification @@ -5205,9 +5205,23 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you th type="notify"> [NAME] declined your friendship offer. </notification> + + <notification + icon="notify.tga" + name="FriendshipAcceptedByMe" + type="offer"> +Friend request accepted. + </notification> <notification icon="notify.tga" + name="FriendshipDeclinedByMe" + type="offer"> +Friend request declined. + </notification> + + <notification + icon="notify.tga" name="OfferCallingCard" type="notify"> [FIRST] [LAST] is offering their calling card. |