1 files changed, 25 insertions, 25 deletions

diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp
index 3ebf0bcc9e..1494ac6b5c 100644
--- a/indra/newview/llnotificationhandlerutil.cpp
+++ b/indra/newview/llnotificationhandlerutil.cpp
@@ -65,7 +65,7 @@ LLSysHandler::LLSysHandler(const std::string& name, const std::string& notificat
 
 void LLSysHandler::removeExclusiveNotifications(const LLNotificationPtr& notif)
 {
-	LLScreenChannel* channel = dynamic_cast<LLScreenChannel *>(mChannel);
+	LLScreenChannel* channel = dynamic_cast<LLScreenChannel *>(mChannel.get());
 	if (channel == NULL)
 	{
 		return;
@@ -200,23 +200,23 @@ void log_name_callback(const std::string& full_name, const std::string& from_nam
 // static
 void LLHandlerUtil::logToIMP2P(const LLNotificationPtr& notification, bool to_file_only)
 {
-	LLUUID from_id = notification->getPayload()["from_id"];
+		LLUUID from_id = notification->getPayload()["from_id"];
 
-	if (from_id.isNull())
-	{
-		llwarns << " from_id for notification " << notification->getName() << " is null " << llendl;
-		return;
-	}
+		if (from_id.isNull())
+		{
+			llwarns << " from_id for notification " << notification->getName() << " is null " << llendl;
+			return;
+		}
 
-	if(to_file_only)
-	{
-		gCacheName->get(from_id, false, boost::bind(&log_name_callback, _2, "", notification->getMessage(), LLUUID()));
-	}
-	else
-	{
-		gCacheName->get(from_id, false, boost::bind(&log_name_callback, _2, INTERACTIVE_SYSTEM_FROM, notification->getMessage(), from_id));
+		if(to_file_only)
+		{
+			gCacheName->get(from_id, false, boost::bind(&log_name_callback, _2, "", notification->getMessage(), LLUUID()));
+		}
+		else
+		{
+			gCacheName->get(from_id, false, boost::bind(&log_name_callback, _2, INTERACTIVE_SYSTEM_FROM, notification->getMessage(), from_id));
+		}
 	}
-}
 
 // static
 void LLHandlerUtil::logGroupNoticeToIMGroup(
@@ -348,20 +348,20 @@ void LLHandlerUtil::updateVisibleIMFLoaterMesages(const LLNotificationPtr& notif
 void LLHandlerUtil::decIMMesageCounter(const LLNotificationPtr& notification)
 {
 	const std::string name = LLHandlerUtil::getSubstitutionName(notification);
-	LLUUID from_id 		   = notification->getPayload()["from_id"];
-	LLUUID session_id 	   = LLIMMgr::computeSessionID(IM_NOTHING_SPECIAL, from_id);
+	LLUUID from_id = notification->getPayload()["from_id"];
+	LLUUID session_id = LLIMMgr::computeSessionID(IM_NOTHING_SPECIAL, from_id);
 
 	LLIMModel::LLIMSession * session = LLIMModel::getInstance()->findIMSession(session_id);
 
 	if (session)
 	{
-		LLSD arg;
-		arg["session_id"] = session_id;
-		session->mNumUnread--;
-		arg["num_unread"] = session->mNumUnread;
-		session->mParticipantUnreadMessageCount--;
-		arg["participant_unread"] = session->mParticipantUnreadMessageCount;
-		LLIMModel::getInstance()->mNewMsgSignal(arg);
-	}
+	LLSD arg;
+	arg["session_id"] = session_id;
+	session->mNumUnread--;
+	arg["num_unread"] = session->mNumUnread;
+	session->mParticipantUnreadMessageCount--;
+	arg["participant_unread"] = session->mParticipantUnreadMessageCount;
+	LLIMModel::getInstance()->mNewMsgSignal(arg);
+}
 }