From 19faceabf4006a9306c01d3208cf54eec332f4e5 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Fri, 25 Dec 2009 17:11:28 +0200
Subject: [PATCH] =?UTF-8?q?EXT-700=20=E2=80=9C"Offer"=20notifications=20sh?=
=?UTF-8?q?ould=20be=20accessible=20via=20chiclet=E2=80=9D=20made=20'inven?=
=?UTF-8?q?tory=20declined'=20notification=20spawn=20chiclet;=20made=20'in?=
=?UTF-8?q?ventory=20declined'=20toast=20as=20notytip;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
--HG--
branch : product-engine
---
indra/newview/llnotificationhandlerutil.cpp | 11 ++++++++---
indra/newview/skins/default/xui/en/notifications.xml | 2 +-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp
index 174efd24a64..59351fcf47a 100644
--- a/indra/newview/llnotificationhandlerutil.cpp
+++ b/indra/newview/llnotificationhandlerutil.cpp
@@ -47,7 +47,9 @@ const static std::string GRANTED_MODIFY_RIGHTS("GrantedModifyRights"),
"ObjectGiveItem"), OBJECT_GIVE_ITEM_UNKNOWN_USER(
"ObjectGiveItemUnknownUser"), PAYMENT_RECIVED("PaymentRecived"),
ADD_FRIEND_WITH_MESSAGE("AddFriendWithMessage"),
- USER_GIVE_ITEM("UserGiveItem"), INVENTORY_ACCEPTED("InventoryAccepted"),
+ USER_GIVE_ITEM("UserGiveItem"),
+ INVENTORY_ACCEPTED("InventoryAccepted"),
+ INVENTORY_DECLINED("InventoryDeclined"),
OFFER_FRIENDSHIP("OfferFriendship"),
FRIENDSHIP_ACCEPTED("FriendshipAccepted"),
FRIENDSHIP_OFFERED("FriendshipOffered"),
@@ -63,7 +65,8 @@ bool LLHandlerUtil::canLogToIM(const LLNotificationPtr& notification)
|| PAYMENT_RECIVED == notification->getName()
|| FRIENDSHIP_OFFERED == notification->getName()
|| SERVER_OBJECT_MESSAGE == notification->getName()
- || INVENTORY_ACCEPTED == notification->getName();
+ || INVENTORY_ACCEPTED == notification->getName()
+ || INVENTORY_DECLINED == notification->getName();
}
// static
@@ -72,7 +75,8 @@ bool LLHandlerUtil::canLogToNearbyChat(const LLNotificationPtr& notification)
return notification->getType() == "notifytip"
&& FRIEND_ONLINE != notification->getName()
&& FRIEND_OFFLINE != notification->getName()
- && INVENTORY_ACCEPTED != notification->getName();
+ && INVENTORY_ACCEPTED != notification->getName()
+ && INVENTORY_DECLINED != notification->getName();
}
// static
@@ -83,6 +87,7 @@ bool LLHandlerUtil::canSpawnIMSession(const LLNotificationPtr& notification)
|| FRIENDSHIP_ACCEPTED == notification->getName()
|| USER_GIVE_ITEM == notification->getName()
|| INVENTORY_ACCEPTED == notification->getName()
+ || INVENTORY_DECLINED == notification->getName()
|| TELEPORT_OFFERED == notification->getName();
}
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ee8b7a5132e..e4ec98c35c3 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4505,7 +4505,7 @@ You don't have permission to copy this.
<notification
icon="notifytip.tga"
name="InventoryDeclined"
- type="offer">
+ type="notifytip">
[NAME] declined your inventory offer.
</notification>
--
GitLab