1 files changed, 3 insertions, 3 deletions

diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index cc86fce..79c4aa6 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -213,9 +213,9 @@ void add_timestamped_line(LLViewerTextEditor* edit, LLChat chat, const LLColor4&
         }
 
         // If the chat line has an associated url, link it up to the name.
-        if (!chat.mURL.empty() && 
-                (line.length() > chat.mFromName.length() && 
-                (line.find(chat.mFromName,0) == 4 || line.find(chat.mFromName,0) == 0)))
+        if ((!chat.mURL.empty() && line.length() > chat.mFromName.length()) && 
+                (line.find(chat.mFromName,0) == 0 || (line.find(chat.mFromName,0) == 4 &&
+                color == gSavedSettings.getColor4("ObjectIMColor")))) // hack to make sure IMs in chat history don't hightlight
         {
                 std::string start_line;
                 if (line.find(chat.mFromName,0) == 4) // IMs are prefaced with "IM: "