1 files changed, 33 insertions, 43 deletions

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index c929e81ea4..5279c4174a 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -54,7 +54,6 @@
 //#include "llfirstuse.h"
 #include "llfloaterbuycurrency.h"
 #include "llfloaterbuyland.h"
-#include "llfloaterchat.h"
 #include "llfloaterland.h"
 #include "llfloaterregioninfo.h"
 #include "llfloaterlandholdings.h"
@@ -835,9 +834,13 @@ bool check_offer_throttle(const std::string& from_name, bool check_only)
 				}
 				message << ", automatic preview disabled for "
 					<< OFFER_THROTTLE_TIME << " seconds.";
-				chat.mText = message.str();
+				
 				//this is kinda important, so actually put it on screen
-				LLFloaterChat::addChat(chat, FALSE, FALSE);
+				std::string log_msg = message.str();
+				LLSD args;
+				args["MESSAGE"] = log_msg;
+				LLNotificationsUtil::add("SystemMessage", args);
+
 				throttle_logged=true;
 			}
 			return false;
@@ -1178,8 +1181,9 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 		if (check_offer_throttle(mFromName, true))
 		{
 			log_message = chatHistory_string + " " + LLTrans::getString("InvOfferGaveYou") + " " + mDesc + LLTrans::getString(".");
-			chat.mText = log_message;
-			LLFloaterChat::addChatHistory(chat);
+			LLSD args;
+			args["MESSAGE"] = log_message;
+			LLNotificationsUtil::add("SystemMessage", args);
 		}
 		break;
 
@@ -1352,8 +1356,10 @@ bool LLOfferInfo::inventory_task_offer_callback(const LLSD& notification, const
 			if (check_offer_throttle(mFromName, true))
 			{
 				log_message = chatHistory_string + " " + LLTrans::getString("InvOfferGaveYou") + " " + mDesc + LLTrans::getString(".");
-				chat.mText = log_message;
-				LLFloaterChat::addChatHistory(chat);
+				//TODO* should go to history only - how?
+				//LLSD args;
+				//args["MESSAGE"] = log_message;
+				//LLNotificationsUtil::add("SystemMessage", args);
 			}
 			
 			// we will want to open this item when it comes back.
@@ -1395,13 +1401,11 @@ bool LLOfferInfo::inventory_task_offer_callback(const LLSD& notification, const
 			// send the message
 			msg->sendReliable(mHost);
 			
-			log_message = LLTrans::getString("InvOfferYouDecline") + " " + mDesc + " " + LLTrans::getString("InvOfferFrom") + " " + mFromName +".";
-			chat.mText = log_message;
-			if( LLMuteList::getInstance()->isMuted(mFromID ) && ! LLMuteList::getInstance()->isLinden(mFromName) )  // muting for SL-42269
-			{
-				chat.mMuted = TRUE;
-			}
-			LLFloaterChat::addChatHistory(chat);
+			//TODO* should go to message history only...
+			//log_message = LLTrans::getString("InvOfferYouDecline") + " " + mDesc + " " + LLTrans::getString("InvOfferFrom") + " " + mFromName +".";
+			//LLSD args;
+			//args["MESSAGE"] = log_message;
+			//LLNotificationsUtil::add("SystemMessage", args);
 			
 			if (busy &&	(!mFromGroup && !mFromObject))
 			{
@@ -1763,10 +1767,6 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				region_id,
 				position,
 				true);
-
-			// pretend this is chat generated by self, so it does not show up on screen
-			chat.mText = std::string("IM: ") + name + separator_string + message;
-			LLFloaterChat::addChat( chat, TRUE, TRUE );
 		}
 		else if (from_id.isNull())
 		{
@@ -1822,19 +1822,24 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 					region_id,
 					position,
 					true);
-				chat.mText = std::string("IM: ") + name + separator_string + saved + message;
-
-				BOOL local_agent = FALSE;
-				LLFloaterChat::addChat( chat, TRUE, local_agent );
 			}
 			else
 			{
 				// muted user, so don't start an IM session, just record line in chat
 				// history.  Pretend the chat is from a local agent,
 				// so it will go into the history but not be shown on screen.
+
+				//TODO* should go to message hisyory only
+				//and this is not system message...
+				//LLSD args;
+				//args["MESSAGE"] = buffer;
+				//LLNotificationsUtil::add("SystemMessage", args);
+
+				/*
 				chat.mText = buffer;
 				BOOL local_agent = TRUE;
 				LLFloaterChat::addChat( chat, TRUE, local_agent );
+				*/
 			}
 		}
 		break;
@@ -2138,9 +2143,6 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			region_id,
 			position,
 			true);
-
-		chat.mText = std::string("IM: ") + name + separator_string +  saved + message;
-		LLFloaterChat::addChat(chat, TRUE, is_this_agent);
 	}
 	break;
 
@@ -2687,22 +2689,8 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 
 		chat.mMuted = is_muted && !is_linden;
 
-		if (!visible_in_chat_bubble 
-			&& (is_linden || !is_busy || is_owned_by_me))
-		{
-			// show on screen and add to history
-			LLNotificationsUI::LLNotificationManager::instance().onChat(
+		LLNotificationsUI::LLNotificationManager::instance().onChat(
 					chat, LLNotificationsUI::NT_NEARBYCHAT);
-
-			LLFloaterChat::addChat(chat, FALSE, FALSE);
-		}
-		else
-		{
-			LLNotificationsUI::LLNotificationManager::instance().onChat(
-					chat, LLNotificationsUI::NT_NEARBYCHAT);
-			// adding temporarily
-			LLFloaterChat::addChatHistory(chat);
-		}
 	}
 }
 
@@ -3087,9 +3075,11 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
 		if (avatarp)
 		{
 			// Chat the "back" SLURL. (DEV-4907)
-			LLChat chat("Teleport completed from " + gAgent.getTeleportSourceSLURL());
-			chat.mSourceType = CHAT_SOURCE_SYSTEM;
- 		    LLFloaterChat::addChatHistory(chat);
+
+			//should go to history only so leave commented
+			//LLSD args;
+			//args["MESSAGE"] = message;
+			//LLNotificationsUtil::add("SystemMessage", args);
 
 			// Set the new position
 			avatarp->setPositionAgent(agent_pos);