1 files changed, 37 insertions, 37 deletions

diff --git a/indra/newview/llnotificationalerthandler.cpp b/indra/newview/llnotificationalerthandler.cpp
index e6239534f7..d13e2b629d 100644
--- a/indra/newview/llnotificationalerthandler.cpp
+++ b/indra/newview/llnotificationalerthandler.cpp
@@ -51,8 +51,8 @@ LLAlertHandler::LLAlertHandler(const std::string& name, const std::string& notif
 	p.channel_align = CA_CENTRE;
 
 	// Getting a Channel for our notifications
-	mChannel = LLChannelManager::getInstance()->getChannel(p);
-	mChannel->setCanStoreToasts(false);
+	mChannel = LLChannelManager::getInstance()->getChannel(p)->getHandle();
+	mChannel.get()->setCanStoreToasts(false);
 }
 
 //--------------------------------------------------------------------------
@@ -64,62 +64,62 @@ LLAlertHandler::~LLAlertHandler()
 void LLAlertHandler::initChannel()
 {
 	S32 channel_right_bound = gViewerWindow->getWorldViewRectScaled().getWidth() / 2;
-	mChannel->init(channel_right_bound, channel_right_bound);
+	mChannel.get()->init(channel_right_bound, channel_right_bound);
 }
 
 //--------------------------------------------------------------------------
 bool LLAlertHandler::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->canLogToIM() && notification->hasFormElements())
-	{
-		const std::string name = LLHandlerUtil::getSubstitutionName(notification);
-
-		LLUUID from_id = notification->getPayload()["from_id"];
-
-		// firstly create session...
-		LLHandlerUtil::spawnIMSession(name, from_id);
-
-		// ...then log message to have IM Well notified about new message
-		LLHandlerUtil::logToIMP2P(notification);
-	}
-
-	LLToastAlertPanel* alert_dialog = new LLToastAlertPanel(notification, mIsModal);
-	LLToast::Params p;
-	p.notif_id = notification->getID();
-	p.notification = notification;
-	p.panel = dynamic_cast<LLToastPanel*>(alert_dialog);
-	p.enable_hide_btn = false;
-	p.can_fade = false;
-	p.is_modal = mIsModal;
-	p.on_delete_toast = boost::bind(&LLAlertHandler::onDeleteToast, this, _1);
-
-	// Show alert in middle of progress view (during teleport) (EXT-1093)
-	LLProgressView* progress = gViewerWindow->getProgressView();
-	LLRect rc = progress && progress->getVisible() ? progress->getRect() : gViewerWindow->getWorldViewRectScaled();
-	mChannel->updatePositionAndSize(rc);
-
-	LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel);
-	if(channel)
-		channel->addToast(p);
+		{
+			const std::string name = LLHandlerUtil::getSubstitutionName(notification);
+
+			LLUUID from_id = notification->getPayload()["from_id"];
+
+			// firstly create session...
+			LLHandlerUtil::spawnIMSession(name, from_id);
+
+			// ...then log message to have IM Well notified about new message
+			LLHandlerUtil::logToIMP2P(notification);
+		}
+
+		LLToastAlertPanel* alert_dialog = new LLToastAlertPanel(notification, mIsModal);
+		LLToast::Params p;
+		p.notif_id = notification->getID();
+		p.notification = notification;
+		p.panel = dynamic_cast<LLToastPanel*>(alert_dialog);
+		p.enable_hide_btn = false;
+		p.can_fade = false;
+		p.is_modal = mIsModal;
+		p.on_delete_toast = boost::bind(&LLAlertHandler::onDeleteToast, this, _1);
+
+		// Show alert in middle of progress view (during teleport) (EXT-1093)
+		LLProgressView* progress = gViewerWindow->getProgressView();
+		LLRect rc = progress && progress->getVisible() ? progress->getRect() : gViewerWindow->getWorldViewRectScaled();
+		mChannel.get()->updatePositionAndSize(rc);
+
+		LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel.get());
+		if(channel)
+			channel->addToast(p);
 	
 	return false;
-}
+	}
 
 void LLAlertHandler::onChange( LLNotificationPtr notification )
 {
 	LLToastAlertPanel* alert_dialog = new LLToastAlertPanel(notification, mIsModal);
-	LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel);
+	LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel.get());
 	if(channel)
 		channel->modifyToastByNotificationID(notification->getID(), (LLToastPanel*)alert_dialog);
 }