1 files changed, 60 insertions, 59 deletions

diff --git a/indra/newview/llnotificationofferhandler.cpp b/indra/newview/llnotificationofferhandler.cpp
index 051075cff9..52cc518968 100644
--- a/indra/newview/llnotificationofferhandler.cpp
+++ b/indra/newview/llnotificationofferhandler.cpp
@@ -44,12 +44,13 @@ LLOfferHandler::LLOfferHandler()
 :	LLSysHandler("Offer", "offer")
 {
 	// Getting a Channel for our notifications
-	mChannel = LLChannelManager::getInstance()->createNotificationChannel();
-	mChannel->setControlHovering(true);
-
-	LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel);
+	LLScreenChannel* channel = LLChannelManager::getInstance()->createNotificationChannel();
 	if(channel)
-		channel->addOnRejectToastCallback(boost::bind(&LLOfferHandler::onRejectToast, this, _1));
+	{
+		channel->setControlHovering(true);
+		channel->setOnRejectToastCallback(boost::bind(&LLOfferHandler::onRejectToast, this, _1));
+		mChannel = channel->getHandle();
+	}
 }
 
 //--------------------------------------------------------------------------
@@ -62,108 +63,108 @@ void LLOfferHandler::initChannel()
 {
 	S32 channel_right_bound = gViewerWindow->getWorldViewRectScaled().mRight - gSavedSettings.getS32("NotificationChannelRightMargin");
 	S32 channel_width = gSavedSettings.getS32("NotifyBoxWidth");
-	mChannel->init(channel_right_bound - channel_width, channel_right_bound);
+	mChannel.get()->init(channel_right_bound - channel_width, channel_right_bound);
 }
 
 //--------------------------------------------------------------------------
 bool LLOfferHandler::processNotification(const LLNotificationPtr& notification)
 {
-	if(!mChannel)
+	if(mChannel.isDead())
 	{
 		return false;
 	}
 
 	// arrange a channel on a screen
-	if(!mChannel->getVisible())
+	if(!mChannel.get()->getVisible())
 	{
 		initChannel();
 	}
 
 
-	if( notification->getPayload().has("give_inventory_notification")
+		if( notification->getPayload().has("give_inventory_notification")
 		&& notification->getPayload()["give_inventory_notification"].asBoolean() == false)
-	{
-		// This is an original inventory offer, so add a script floater
-		LLScriptFloaterManager::instance().onAddNotification(notification->getID());
-	}
-	else
-	{
+		{
+			// This is an original inventory offer, so add a script floater
+			LLScriptFloaterManager::instance().onAddNotification(notification->getID());
+		}
+		else
+		{
 		bool add_notif_to_im = notification->canLogToIM() && notification->hasFormElements();
 
 		notification->setReusable(add_notif_to_im);
 
-		LLUUID session_id;
+			LLUUID session_id;
 		if (add_notif_to_im)
-		{
-			const std::string name = LLHandlerUtil::getSubstitutionName(notification);
+			{
+				const std::string name = LLHandlerUtil::getSubstitutionName(notification);
 
-			LLUUID from_id = notification->getPayload()["from_id"];
+				LLUUID from_id = notification->getPayload()["from_id"];
 
-			session_id = LLHandlerUtil::spawnIMSession(name, from_id);
-			LLHandlerUtil::addNotifPanelToIM(notification);
-		}
+				session_id = LLHandlerUtil::spawnIMSession(name, from_id);
+				LLHandlerUtil::addNotifPanelToIM(notification);
+			}
 
-		if (notification->getPayload().has("SUPPRESS_TOAST")
-					&& notification->getPayload()["SUPPRESS_TOAST"])
-		{
-			LLNotificationsUtil::cancel(notification);
-		}
+			if (notification->getPayload().has("SUPPRESS_TOAST")
+						&& notification->getPayload()["SUPPRESS_TOAST"])
+			{
+				LLNotificationsUtil::cancel(notification);
+			}
 		else if(!notification->canLogToIM() || !LLHandlerUtil::isIMFloaterOpened(notification))
-		{
-			LLToastNotifyPanel* notify_box = new LLToastNotifyPanel(notification);
-			// don't close notification on panel destroy since it will be used by IM floater
+			{
+				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_notif_to_im);
-			LLToast::Params p;
-			p.notif_id = notification->getID();
-			p.notification = notification;
-			p.panel = notify_box;
-			// we not save offer notifications to the syswell floater that should be added to the IM floater
+				LLToast::Params p;
+				p.notif_id = notification->getID();
+				p.notification = notification;
+				p.panel = notify_box;
+				// we not save offer notifications to the syswell floater that should be added to the IM floater
 			p.can_be_stored = !add_notif_to_im;
 
-			LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel);
-			if(channel)
-				channel->addToast(p);
-		}
+				LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel.get());
+				if(channel)
+					channel->addToast(p);
+			}
 
 		if (notification->canLogToIM())
-		{
-			// log only to file if notif panel can be embedded to IM and IM is opened
+			{
+				// log only to file if notif panel can be embedded to IM and IM is opened
 			bool file_only = add_notif_to_im && LLHandlerUtil::isIMFloaterOpened(notification);
 			LLHandlerUtil::logToIMP2P(notification, file_only);
-		}
-	}
+				}
+				}
 
 	return false;
-}
+			}
 
 /*virtual*/ void LLOfferHandler::onDelete(LLNotificationPtr notification)
-{
-	if( notification->getPayload().has("give_inventory_notification")
-		&& !notification->getPayload()["give_inventory_notification"] )
-	{
-		// Remove original inventory offer script floater
-		LLScriptFloaterManager::instance().onRemoveNotification(notification->getID());
-	}
-	else
 	{
+		if( notification->getPayload().has("give_inventory_notification")
+			&& !notification->getPayload()["give_inventory_notification"] )
+		{
+			// Remove original inventory offer script floater
+			LLScriptFloaterManager::instance().onRemoveNotification(notification->getID());
+		}
+		else
+		{
 		if (notification->canLogToIM() 
 			&& notification->hasFormElements()
-			&& !LLHandlerUtil::isIMFloaterOpened(notification))
-		{
-			LLHandlerUtil::decIMMesageCounter(notification);
+					&& !LLHandlerUtil::isIMFloaterOpened(notification))
+			{
+				LLHandlerUtil::decIMMesageCounter(notification);
+			}
+			mChannel.get()->killToastByNotificationID(notification->getID());
 		}
-		mChannel->killToastByNotificationID(notification->getID());
 	}
-}
 
 //--------------------------------------------------------------------------
 void LLOfferHandler::onRejectToast(LLUUID& id)
 {
 	LLNotificationPtr notification = LLNotifications::instance().find(id);
 
-	if (notification 
+	if (notification
 		&& mItems.find(notification) != mItems.end()
-		// don't delete notification since it may be used by IM floater
+					// don't delete notification since it may be used by IM floater
 		&& (!notification->canLogToIM() || !notification->hasFormElements()))
 	{
 		LLNotifications::instance().cancel(notification);