From af3e9ef15886ab01bd123a2fc1cec5cf0f08b357 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Thu, 8 Oct 2009 03:01:21 -0700 Subject: Clickable IMs in chat history was causing readability problems at varying distances, decided it was a bug and fixed it --- ChangeLog.txt | 6 ++++++ linden/indra/newview/llfloaterchat.cpp | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 20328a0..9a63b6b 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,11 @@ 2009-10-07 McCabe Maxsted + * Clickable IMs in chat history was causing readability problems at varying distances, + decided it was a bug and fixed it. + + modified: linden/indra/newview/llfloaterchat.cpp + + * Mini-map radar now can notify you when someone enters the sim. modified: linden/indra/newview/app_settings/settings.xml diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp index cc86fce..5cb4282 100644 --- a/linden/indra/newview/llfloaterchat.cpp +++ b/linden/indra/newview/llfloaterchat.cpp @@ -215,7 +215,8 @@ 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))) + (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 { std::string start_line; if (line.find(chat.mFromName,0) == 4) // IMs are prefaced with "IM: " -- cgit v1.1