summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/notifications.xml
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-12-07 15:57:31 -0800
committerSteve Bennetts <steve@lindenlab.com>2009-12-07 15:57:31 -0800
commit0b4b03fe3e92f0991b8145a2ba8267a20ce53581 (patch)
treeadef5f205fd2ba632c1e6db79d575b1c3ceb081d /indra/newview/skins/default/xui/en/notifications.xml
parent374aa101ab0296d9bed3e7c592e4820930042f6e (diff)
parentc3a82913deb9b23ef1f22b6d002893b36146553a (diff)
Merge from product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml11
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d8eb65322b..f659062cfe 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4499,14 +4499,14 @@ You don&apos;t have permission to copy this.
<notification
icon="notifytip.tga"
name="InventoryAccepted"
- type="notifytip">
+ type="offer">
[NAME] received your inventory offer.
</notification>
<notification
icon="notifytip.tga"
name="InventoryDeclined"
- type="notifytip">
+ type="offer">
[NAME] declined your inventory offer.
</notification>
@@ -5128,6 +5128,13 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [O
text="Decline"/>
</form>
</notification>
+
+ <notification
+ icon="notify.tga"
+ name="FriendshipOffered"
+ type="offer">
+ You have offered friendship to [TO_NAME]
+ </notification>
<notification
icon="notify.tga"