From 2d366069742c8df225faaa3ad234aac7d24b2d38 Mon Sep 17 00:00:00 2001
From: elektrahesse
Date: Fri, 1 Oct 2010 01:52:33 +0200
Subject: Enabled friends chat and keywords highlighting for both IMs and Group
 IMs.

---
 linden/indra/newview/llimview.cpp | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llimview.cpp b/linden/indra/newview/llimview.cpp
index 12a26f9..a6eaeb3 100644
--- a/linden/indra/newview/llimview.cpp
+++ b/linden/indra/newview/llimview.cpp
@@ -548,19 +548,13 @@ LLColor4 get_extended_text_color(const LLUUID session_id, const LLUUID other_par
 {
 	if (gSavedSettings.getBOOL("HighlightOwnNameInIM") && (other_partecipant_id != LLUUID::null))
 	{
-		LLDynamicArray<LLGroupData>::iterator i;
-		for (i = gAgent.mGroups.begin(); i != gAgent.mGroups.end(); i++)
-		{
-			if (i->mID == session_id)
-			{
-				if (LLFloaterChat::isOwnNameInText(msg))
-					return gSavedSettings.getColor4("OwnNameChatColor");
-				else
-					break;
-			}
-		}
+		if (LLFloaterChat::isOwnNameInText(msg))
+			return gSavedSettings.getColor4("OwnNameChatColor");
 	}
 
+	if (gSavedSettings.getBOOL("HighlightFriendsChat") && is_agent_friend(other_partecipant_id))
+		return gSavedSettings.getColor4("FriendsChatColor");
+
 	return defaultColor;
 }
 
-- 
cgit v1.1