From 97ffd449826500e15fdd11840a80fd38f3cf91a3 Mon Sep 17 00:00:00 2001
From: Cinders <cinder.roxley@phoenixviewer.com>
Date: Thu, 27 Jun 2013 14:38:28 -0600
Subject: [PATCH] Fix reporting to chat

---
 indra/newview/fscommon.cpp                           |  9 +++++----
 indra/newview/fsradar.cpp                            |  1 -
 indra/newview/llcallingcard.cpp                      |  5 ++---
 indra/newview/llnotificationmanager.cpp              |  2 +-
 indra/newview/skins/default/xui/en/notifications.xml | 10 ----------
 5 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/indra/newview/fscommon.cpp b/indra/newview/fscommon.cpp
index 6879e982e4..f0c7dae7c6 100644
--- a/indra/newview/fscommon.cpp
+++ b/indra/newview/fscommon.cpp
@@ -54,11 +54,12 @@ S32 FSCommon::sObjectAddMsg = 0;
 
 void reportToNearbyChat(const std::string& message)
 {
-	// Generic report to chat convenience function
-	// TODO: This should be replaced with a proper report to chat notification method <FS:CR>
+	LLChat chat;
+	chat.mText = message;
+	chat.mSourceType = CHAT_SOURCE_SYSTEM;
 	LLSD args;
-	args["message"] = message;
-	LLNotificationsUtil::add("ReportToNearbyChat", args);
+	LLNotificationsUI::LLNotificationManager::instance().onChat(chat, args);
+
 }
 
 std::string applyAutoCloseOoc(const std::string& message)
diff --git a/indra/newview/fsradar.cpp b/indra/newview/fsradar.cpp
index a40b0732a4..97052aad8b 100644
--- a/indra/newview/fsradar.cpp
+++ b/indra/newview/fsradar.cpp
@@ -136,7 +136,6 @@ void FSRadar::radarAlertMsg(const LLUUID& agent_id, const LLAvatarName& av_name,
 		chat.mChatType = CHAT_TYPE_RADAR;
 		// FS:LO FIRE-1439 - Clickable avatar names on local chat radar crossing reports
 		LLSD args;
-		args["type"] = LLNotificationsUI::NT_NEARBYCHAT;
 		LLNotificationsUI::LLNotificationManager::instance().onChat(chat, args);
 	} // <FS:CR />
 }
diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp
index c5f1d8550a..30e61c7285 100644
--- a/indra/newview/llcallingcard.cpp
+++ b/indra/newview/llcallingcard.cpp
@@ -71,8 +71,8 @@
 #include "fsfloaternearbychat.h" //<FS:TM> CHUI Merge can we get rid if this? line 903
 // <FS:Ansariel> [FS communication UI]
 // </FS:Zi>
-//#include "llfloaterreg.h"
-//#include "llnotificationmanager.h"
+#include "llfloaterreg.h"
+#include "llnotificationmanager.h"
 // <FS:Ansariel> [FS communication UI]
 //#include "llimfloater.h"
 #include "fsfloaterim.h"
@@ -895,7 +895,6 @@ static void on_avatar_name_cache_notify(const LLUUID& agent_id,
 		LLChat chat;
 		chat.mText = notify_msg;
 		chat.mSourceType = CHAT_SOURCE_SYSTEM;
-		args["type"] = LLNotificationsUI::NT_NEARBYCHAT; //<FS:TM> CHUI Merge error- has no member NT_NEARBYCHAT
 		if (history_only)
 		{
 			// <FS:Ansariel> [FS communication UI]
diff --git a/indra/newview/llnotificationmanager.cpp b/indra/newview/llnotificationmanager.cpp
index 152581c5a0..56f13802e3 100644
--- a/indra/newview/llnotificationmanager.cpp
+++ b/indra/newview/llnotificationmanager.cpp
@@ -72,5 +72,5 @@ void LLNotificationManager::onChat(const LLChat& msg, const LLSD &args)
 {
 	if(mChatHandler)
 		mChatHandler->processChat(msg, args);
-		}
+}
 
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 4008938569..de3eb3c786 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11263,14 +11263,4 @@ You are about to eject [COUNT] members from the group.
         yestext="Eject"/>
     </notification>
 	
-	<notification
-		icon="notify.tga"
-		name="ReportToNearbyChat"
-		log_to_im="false"
-		log_to_chat="true"
-		show_toast="false"
-		type="notify">
-[MESSAGE]
-	</notification>
-	
 </notifications>