1 files changed, 67 insertions, 33 deletions

diff --git a/indra/newview/llnotificationofferhandler.cpp b/indra/newview/llnotificationofferhandler.cpp
index fad0c6a91e..85f95bd0c7 100644
--- a/indra/newview/llnotificationofferhandler.cpp
+++ b/indra/newview/llnotificationofferhandler.cpp
@@ -2,31 +2,25 @@
  * @file llnotificationofferhandler.cpp
  * @brief Notification Handler Class for Simple Notifications and Notification Tips
  *
- * $LicenseInfo:firstyear=2000&license=viewergpl$
- *
- * Copyright (c) 2000-2009, Linden Research, Inc.
- *
+ * $LicenseInfo:firstyear=2000&license=viewerlgpl$
  * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- *
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlifegrid.net/programs/open_source/licensing/flossexception
- *
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- *
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
 
@@ -93,7 +87,7 @@ bool LLOfferHandler::processNotification(const LLSD& notify)
 
 	if(notify["sigtype"].asString() == "add" || notify["sigtype"].asString() == "change")
 	{
-		LLHandlerUtil::logToIMP2P(notification);
+
 
 		if( notification->getPayload().has("give_inventory_notification")
 			&& !notification->getPayload()["give_inventory_notification"] )
@@ -103,13 +97,23 @@ bool LLOfferHandler::processNotification(const LLSD& notify)
 		}
 		else
 		{
+			notification->setReusable(LLHandlerUtil::isNotificationReusable(notification));
+
+			LLUUID session_id;
 			if (LLHandlerUtil::canSpawnIMSession(notification))
 			{
 				const std::string name = LLHandlerUtil::getSubstitutionName(notification);
 
 				LLUUID from_id = notification->getPayload()["from_id"];
 
-				LLHandlerUtil::spawnIMSession(name, from_id);
+				session_id = LLHandlerUtil::spawnIMSession(name, from_id);
+			}
+
+			bool show_toast = LLHandlerUtil::canSpawnToast(notification);
+			bool add_notid_to_im = LLHandlerUtil::canAddNotifPanelToIM(notification);
+			if (add_notid_to_im)
+			{
+				LLHandlerUtil::addNotifPanelToIM(notification);
 			}
 
 			if (notification->getPayload().has("SUPPRESS_TOAST")
@@ -117,22 +121,42 @@ bool LLOfferHandler::processNotification(const LLSD& notify)
 			{
 				LLNotificationsUtil::cancel(notification);
 			}
-			else
+			else if(show_toast)
 			{
 				LLToastNotifyPanel* notify_box = new LLToastNotifyPanel(notification);
-
+				// don't close notification on panel destroy since it will be used by IM floater
+				notify_box->setCloseNotificationOnDestroy(!add_notid_to_im);
 				LLToast::Params p;
 				p.notif_id = notification->getID();
 				p.notification = notification;
 				p.panel = notify_box;
 				p.on_delete_toast = boost::bind(&LLOfferHandler::onDeleteToast, this, _1);
+				// we not save offer notifications to the syswell floater that should be added to the IM floater
+				p.can_be_stored = !add_notid_to_im;
 
 				LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel);
 				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))
+			{
+				// log only to file if notif panel can be embedded to IM and IM is opened
+				if (add_notid_to_im && LLHandlerUtil::isIMFloaterOpened(notification))
+				{
+					LLHandlerUtil::logToIMP2P(notification, true);
+				}
+				else
+				{
+					LLHandlerUtil::logToIMP2P(notification);
+				}
 			}
 		}
 	}
@@ -146,6 +170,11 @@ bool LLOfferHandler::processNotification(const LLSD& notify)
 		}
 		else
 		{
+			if (LLHandlerUtil::canAddNotifPanelToIM(notification)
+					&& !LLHandlerUtil::isIMFloaterOpened(notification))
+			{
+				LLHandlerUtil::decIMMesageCounter(notification);
+			}
 			mChannel->killToastByNotificationID(notification->getID());
 		}
 	}
@@ -157,8 +186,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
@@ -172,7 +204,9 @@ void LLOfferHandler::onRejectToast(LLUUID& id)
 
 	if (notification
 			&& LLNotificationManager::getInstance()->getHandlerForNotification(
-					notification->getType()) == this)
+					notification->getType()) == this
+					// don't delete notification since it may be used by IM floater
+					&& !LLHandlerUtil::canAddNotifPanelToIM(notification))
 	{
 		LLNotifications::instance().cancel(notification);
 	}