From d8a02396cad94a191a7cea0f710217615f8cfc93 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 8 Sep 2010 20:51:56 -0700
Subject: Updated the formatting for group IMs to make it clear they're IMs

---
 linden/indra/newview/llviewermessage.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index ec6d4d4..bfd1045 100755
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -2316,8 +2316,11 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 		std::string group_name;
 		if (gAgent.isInGroup(session_id) && gSavedSettings.getBOOL("ShowGroupNameInChatIM"))
 		{
-			group_name = std::string((char*)binary_bucket);
-			chat.mText = std::string("[") + group_name + std::string("] ") + name 
+			if (!(gCacheName->getGroupName(from_id, group_name)))
+			{
+				group_name = std::string((char*)binary_bucket);
+			}
+			chat.mText = std::string("IM [") + group_name + std::string("] ") + name 
 						+ separator_string + saved + message.substr(message_offset);
 		}
 		else
-- 
cgit v1.1