1 files changed, 51 insertions, 47 deletions

diff --git a/indra/newview/llnotificationtiphandler.cpp b/indra/newview/llnotificationtiphandler.cpp
index 0b0ac040cb..f07109335d 100644
--- a/indra/newview/llnotificationtiphandler.cpp
+++ b/indra/newview/llnotificationtiphandler.cpp
@@ -45,11 +45,12 @@ LLTipHandler::LLTipHandler()
 :	LLSysHandler("NotificationTips", "notifytip")
 {
 	// Getting a Channel for our notifications
-	mChannel = LLChannelManager::getInstance()->createNotificationChannel();
-
-	LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel);
+	LLScreenChannel* channel = LLChannelManager::getInstance()->createNotificationChannel();
 	if(channel)
+	{
 		channel->addOnRejectToastCallback(boost::bind(&LLTipHandler::onRejectToast, this, _1));
+		mChannel = channel->getHandle();
+	}
 }
 
 //--------------------------------------------------------------------------
@@ -62,77 +63,80 @@ void LLTipHandler::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 LLTipHandler::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();
 	}
 
-	// archive message in nearby chat
+		// archive message in nearby chat
 	if (notification->canLogToChat())
-	{
-		LLHandlerUtil::logToNearbyChat(notification, CHAT_SOURCE_SYSTEM);
-
-		// don't show toast if Nearby Chat is opened
-		LLNearbyChat* nearby_chat = LLNearbyChat::getInstance();
-		LLNearbyChatBar* nearby_chat_bar = LLNearbyChatBar::getInstance();
-		if (!nearby_chat_bar->isMinimized() && nearby_chat_bar->getVisible() && nearby_chat->getVisible())
 		{
-			return false;
+			LLHandlerUtil::logToNearbyChat(notification, CHAT_SOURCE_SYSTEM);
+
+			// don't show toast if Nearby Chat is opened
+			LLNearbyChat* nearby_chat = LLNearbyChat::getInstance();
+			LLNearbyChatBar* nearby_chat_bar = LLNearbyChatBar::getInstance();
+			if (!nearby_chat_bar->isMinimized() && nearby_chat_bar->getVisible() && nearby_chat->getVisible())
+			{
+				return false;
+			}
 		}
-	}
 
-	std::string session_name = notification->getPayload()["SESSION_NAME"];
-	const std::string name = notification->getSubstitutions()["NAME"];
-	if (session_name.empty())
-	{
-		session_name = name;
-	}
-	LLUUID from_id = notification->getPayload()["from_id"];
+		std::string session_name = notification->getPayload()["SESSION_NAME"];
+		const std::string name = notification->getSubstitutions()["NAME"];
+		if (session_name.empty())
+		{
+			session_name = name;
+		}
+		LLUUID from_id = notification->getPayload()["from_id"];
 	if (notification->canLogToIM())
-	{
-		LLHandlerUtil::logToIM(IM_NOTHING_SPECIAL, session_name, name,
-				notification->getMessage(), from_id, from_id);
-	}
+		{
+			LLHandlerUtil::logToIM(IM_NOTHING_SPECIAL, session_name, name,
+					notification->getMessage(), from_id, from_id);
+		}
 
 	if (notification->canLogToIM() && notification->hasFormElements())
-	{
-		LLHandlerUtil::spawnIMSession(name, from_id);
-	}
+		{
+			LLHandlerUtil::spawnIMSession(name, from_id);
+		}
 
 	if (notification->canLogToIM() && LLHandlerUtil::isIMFloaterOpened(notification))
-	{
-		return false;
-	}
+		{
+			return false;
+		}
 
-	LLToastPanel* notify_box = LLToastPanel::buidPanelFromNotification(notification);
+		LLToastPanel* notify_box = LLToastPanel::buidPanelFromNotification(notification);
 
-	LLToast::Params p;
-	p.notif_id = notification->getID();
-	p.notification = notification;
-	p.lifetime_secs = gSavedSettings.getS32("NotificationTipToastLifeTime");
-	p.panel = notify_box;
-	p.is_tip = true;
-	p.can_be_stored = false;
+		LLToast::Params p;
+		p.notif_id = notification->getID();
+		p.notification = notification;
+		p.lifetime_secs = gSavedSettings.getS32("NotificationTipToastLifeTime");
+		p.panel = notify_box;
+		p.is_tip = true;
+		p.can_be_stored = false;
 		
-	removeExclusiveNotifications(notification);
-
-	LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel);
-	if(channel)
-		channel->addToast(p);
-	
+		removeExclusiveNotifications(notification);
 
+		LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel.get());
+		if(channel)
+			channel->addToast(p);
+	}
+	else if (notify["sigtype"].asString() == "delete")
+	{
+		mChannel->killToastByNotificationID(notification->getID());
+	}
 	return false;
 }