fixed EXT-5910 “Offers logging”,

fixed IM message counter when received interactive notification(offer);
corrected logging to file of offer notification;
enabled logging for FRIENDSHIP_ACCEPTED notification;

--HG--
branch : product-engine

3 files changed, 20 insertions, 7 deletions

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index b3f085ef6d..9ea8364491 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -723,7 +723,9 @@ LLIMModel::LLIMSession* LLIMModel::addMessageSilently(const LLUUID& session_id,
 	session->mNumUnread++;
 
 	//update count of unread messages from real participant
-	if (!(from_id.isNull() || from_id == gAgentID || SYSTEM_FROM == from))
+	if (!(from_id.isNull() || from_id == gAgentID || SYSTEM_FROM == from)
+			// we should increment counter for interactive system messages()
+			|| INTERACTIVE_SYSTEM_FROM == from)
 	{
 		++(session->mParticipantUnreadMessageCount);
 	}
diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp
index 8d1c244a7e..7b61b200cd 100644
--- a/indra/newview/llnotificationhandlerutil.cpp
+++ b/indra/newview/llnotificationhandlerutil.cpp
@@ -139,6 +139,7 @@ bool LLHandlerUtil::canLogToIM(const LLNotificationPtr& notification)
 			|| PAYMENT_RECIVED == notification->getName()
 			|| OFFER_FRIENDSHIP == notification->getName()
 			|| FRIENDSHIP_OFFERED == notification->getName()
+			|| FRIENDSHIP_ACCEPTED == notification->getName()
 			|| FRIENDSHIP_ACCEPTED_BYME == notification->getName()
 			|| FRIENDSHIP_DECLINED_BYME == notification->getName()
 			|| SERVER_OBJECT_MESSAGE == notification->getName()
@@ -274,12 +275,12 @@ void LLHandlerUtil::logToIMP2P(const LLNotificationPtr& notification, bool to_fi
 
 		if(to_file_only)
 		{
-			logToIM(IM_NOTHING_SPECIAL, session_name, name, notification->getMessage(),
-					LLUUID(), LLUUID());
+			logToIM(IM_NOTHING_SPECIAL, session_name, "", notification->getMessage(),
+					from_id, LLUUID());
 		}
 		else
 		{
-			logToIM(IM_NOTHING_SPECIAL, session_name, "", notification->getMessage(),
+			logToIM(IM_NOTHING_SPECIAL, session_name, INTERACTIVE_SYSTEM_FROM, notification->getMessage(),
 					from_id, LLUUID());
 		}
 	}
diff --git a/indra/newview/llnotificationofferhandler.cpp b/indra/newview/llnotificationofferhandler.cpp
index 3304d7f030..97a1df66df 100644
--- a/indra/newview/llnotificationofferhandler.cpp
+++ b/indra/newview/llnotificationofferhandler.cpp
@@ -156,7 +156,14 @@ bool LLOfferHandler::processNotification(const LLSD& notify)
 
 			if (LLHandlerUtil::canLogToIM(notification))
 			{
-				LLHandlerUtil::logToIMP2P(notification);
+				if (LLHandlerUtil::isIMFloaterOpened(notification))
+				{
+					LLHandlerUtil::logToIMP2P(notification, true);
+				}
+				else
+				{
+					LLHandlerUtil::logToIMP2P(notification);
+				}
 			}
 
 			// update IM floater messages if need
@@ -192,8 +199,11 @@ bool LLOfferHandler::processNotification(const LLSD& notify)
 
 void LLOfferHandler::onDeleteToast(LLToast* toast)
 {
-	// send a signal to the counter manager
-	mDelNotificationSignal();
+	if (!LLHandlerUtil::canAddNotifPanelToIM(toast->getNotification()))
+	{
+		// send a signal to the counter manager
+		mDelNotificationSignal();
+	}
 
 	// send a signal to a listener to let him perform some action
 	// in this case listener is a SysWellWindow and it will remove a corresponding item from its list