Implemented normal sub-task EXT-5909(Accepted/declined inventory offer shouldn't spawn chiclet).

- Removed check for INVENTORY_DECLINED from LLHandlerUtil::canSpawnIMSession().
- Added new method LLHandlerUtil::canSpawnToast() and check with it to LLTipHandler::processNotification() to supress toasts when respective IM window is open.

--HG--
branch : product-engine

1 files changed, 9 insertions, 1 deletions

diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp
index 554b67c47d..680309167e 100644
--- a/indra/newview/llnotificationhandlerutil.cpp
+++ b/indra/newview/llnotificationhandlerutil.cpp
@@ -165,7 +165,6 @@ bool LLHandlerUtil::canSpawnIMSession(const LLNotificationPtr& notification)
 {
 	return OFFER_FRIENDSHIP == notification->getName()
 			|| USER_GIVE_ITEM == notification->getName()
-			|| INVENTORY_DECLINED == notification->getName()
 			|| TELEPORT_OFFERED == notification->getName();
 }
 
@@ -184,6 +183,15 @@ bool LLHandlerUtil::canSpawnSessionAndLogToIM(const LLNotificationPtr& notificat
 }
 
 // static
+bool LLHandlerUtil::canSpawnToast(const LLNotificationPtr& notification)
+{
+	bool cannot_spawn = isIMFloaterOpened(notification) && (INVENTORY_DECLINED == notification->getName()
+			|| INVENTORY_ACCEPTED == notification->getName());
+	
+	return !cannot_spawn;
+}
+
+// static
 bool LLHandlerUtil::isIMFloaterOpened(const LLNotificationPtr& notification)
 {
 	bool res = false;