From c76f9f1fc388d23c047a41c68e8361068b2e4c3c Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Thu, 8 Oct 2009 12:02:28 -0700 Subject: Fixed stupid error on my part that broke clickable names in chat history --- ChangeLog.txt | 5 +++++ linden/indra/newview/llfloaterchat.cpp | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index ef576cc..045583c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -3,6 +3,11 @@ * Fixed entering sim notification being tied to radar range. modified: linden/indra/newview/llfloatermap.cpp + + + * Fixed stupid error on my part that broke clickable names in chat history. + + modified: linden/indra/newview/llfloaterchat.cpp 2009-10-07 McCabe Maxsted diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp index 5cb4282..79c4aa6 100644 --- a/linden/indra/newview/llfloaterchat.cpp +++ b/linden/indra/newview/llfloaterchat.cpp @@ -213,10 +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)) && - color == gSavedSettings.getColor4("ObjectIMColor")) // hack to make sure IMs in chat history don't hightlight + 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: " -- cgit v1.1