Merge from viewer2. Minor conflict resolved.

1 files changed, 20 insertions, 17 deletions

diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp
index 9ce3f29853..f7f7ee83af 100644
--- a/indra/newview/llchatitemscontainerctrl.cpp
+++ b/indra/newview/llchatitemscontainerctrl.cpp
@@ -168,27 +168,30 @@ void LLNearbyChatToastPanel::init(LLSD& notification)
 
 	msg_text->setText(std::string(""));
 
-	std::string str_sender;
-	
-	str_sender = fromName;
+	if ( notification["chat_style"].asInteger() != CHAT_STYLE_IRC )
+	{
+		std::string str_sender;
 
-	str_sender+=" ";
+		str_sender = fromName;
 
-	//append user name
-	{
-		LLStyle::Params style_params_name;
+		str_sender+=" ";
 
-		LLColor4 userNameColor = LLUIColorTable::instance().getColor("ChatToastAgentNameColor");
+		//append user name
+		{
+			LLStyle::Params style_params_name;
 
-		style_params_name.color(userNameColor);
-		
-		std::string font_name = LLFontGL::nameFromFont(messageFont);
-		std::string font_style_size = LLFontGL::sizeFromFont(messageFont);
-		style_params_name.font.name(font_name);
-		style_params_name.font.size(font_style_size);
-		
-		msg_text->appendText(str_sender, FALSE, style_params_name);
-		
+			LLColor4 userNameColor = LLUIColorTable::instance().getColor("ChatToastAgentNameColor");
+
+			style_params_name.color(userNameColor);
+
+			std::string font_name = LLFontGL::nameFromFont(messageFont);
+			std::string font_style_size = LLFontGL::sizeFromFont(messageFont);
+			style_params_name.font.name(font_name);
+			style_params_name.font.size(font_style_size);
+
+			msg_text->appendText(str_sender, FALSE, style_params_name);
+
+		}
 	}
 
 	//append text