fixed EXT-5908 “Accepted friendship notification shouldn't spawn chiclet”,

made not spawn IM chiclet friendship accepted notification;
added friendship accepted notification to syswell chiclet;

--HG--
branch : product-engine

indra/newview/llchiclet.cpp

@@ -320,6 +320,7 @@ LLNotificationChiclet::LLNotificationChiclet(const Params& p)
 	// connect counter handlers to the signals
 	connectCounterUpdatersToSignal("notify");
 	connectCounterUpdatersToSignal("groupnotify");
+	connectCounterUpdatersToSignal("offer");
 
 	// ensure that notification well window exists, to synchronously
 	// handle toast add/delete events.

indra/newview/llnotificationhandlerutil.cpp

@@ -163,7 +163,6 @@ bool LLHandlerUtil::canLogToNearbyChat(const LLNotificationPtr& notification)
 bool LLHandlerUtil::canSpawnIMSession(const LLNotificationPtr& notification)
 {
 	return OFFER_FRIENDSHIP == notification->getName()
-			|| FRIENDSHIP_ACCEPTED == notification->getName()
 			|| USER_GIVE_ITEM == notification->getName()
 			|| INVENTORY_ACCEPTED == notification->getName()
 			|| INVENTORY_DECLINED == notification->getName()

indra/newview/llnotificationofferhandler.cpp

@@ -146,8 +146,12 @@ bool LLOfferHandler::processNotification(const LLSD& notify)
 				if(channel)
 					channel->addToast(p);
 
-				// send a signal to the counter manager
-				mNewNotificationSignal();
+				// if we not add notification to IM - add it to notification well
+				if (!add_notid_to_im)
+				{
+					// send a signal to the counter manager
+					mNewNotificationSignal();
+				}
 			}
 
 			if (LLHandlerUtil::canLogToIM(notification))