aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt5
-rw-r--r--linden/indra/newview/llfloaterchat.cpp7
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 @@
3 * Fixed entering sim notification being tied to radar range. 3 * Fixed entering sim notification being tied to radar range.
4 4
5 modified: linden/indra/newview/llfloatermap.cpp 5 modified: linden/indra/newview/llfloatermap.cpp
6
7
8 * Fixed stupid error on my part that broke clickable names in chat history.
9
10 modified: linden/indra/newview/llfloaterchat.cpp
6 11
7 12
82009-10-07 McCabe Maxsted <hakushakukun@gmail.com> 132009-10-07 McCabe Maxsted <hakushakukun@gmail.com>
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&
213 } 213 }
214 214
215 // If the chat line has an associated url, link it up to the name. 215 // If the chat line has an associated url, link it up to the name.
216 if (!chat.mURL.empty() && 216 if ((!chat.mURL.empty() && line.length() > chat.mFromName.length()) &&
217 (line.length() > chat.mFromName.length() && 217 (line.find(chat.mFromName,0) == 0 || (line.find(chat.mFromName,0) == 4 &&
218 (line.find(chat.mFromName,0) == 4 || line.find(chat.mFromName,0) == 0)) && 218 color == gSavedSettings.getColor4("ObjectIMColor")))) // hack to make sure IMs in chat history don't hightlight
219 color == gSavedSettings.getColor4("ObjectIMColor")) // hack to make sure IMs in chat history don't hightlight
220 { 219 {
221 std::string start_line; 220 std::string start_line;
222 if (line.find(chat.mFromName,0) == 4) // IMs are prefaced with "IM: " 221 if (line.find(chat.mFromName,0) == 4) // IMs are prefaced with "IM: "