sunshine-external merge WIP

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp
index ef4d735616..a078889d46 100755
--- a/indra/newview/llnotificationhandlerutil.cpp
+++ b/indra/newview/llnotificationhandlerutil.cpp
@@ -135,7 +135,7 @@ void LLHandlerUtil::logToIMP2P(const LLNotificationPtr& notification, bool to_fi
 	if (from_id.isNull())
 	{
 		// Normal behavior for system generated messages, don't spam.
-		// llwarns << " from_id for notification " << notification->getName() << " is null " << llendl;
+		// LL_WARNS() << " from_id for notification " << notification->getName() << " is null " << LL_ENDL;
 		return;
 	}
 
@@ -158,9 +158,9 @@ void LLHandlerUtil::logGroupNoticeToIMGroup(
 	LLGroupData groupData;
 	if (!gAgent.getGroupData(payload["group_id"].asUUID(), groupData))
 	{
-		llwarns
+		LL_WARNS()
 						<< "Group notice for unknown group: "
-								<< payload["group_id"].asUUID() << llendl;
+								<< payload["group_id"].asUUID() << LL_ENDL;
 		return;
 	}