diff options
| author | McCabe Maxsted | 2009-10-08 12:02:28 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-10-08 12:02:28 -0700 |
| commit | c76f9f1fc388d23c047a41c68e8361068b2e4c3c (patch) | |
| tree | 8d9615a871bd0ad1e46aac2936ed21d0b4de2d68 /linden/indra/newview | |
| parent | Fixed entering sim notification being tied to radar range (diff) | |
| download | meta-impy-c76f9f1fc388d23c047a41c68e8361068b2e4c3c.zip meta-impy-c76f9f1fc388d23c047a41c68e8361068b2e4c3c.tar.gz meta-impy-c76f9f1fc388d23c047a41c68e8361068b2e4c3c.tar.bz2 meta-impy-c76f9f1fc388d23c047a41c68e8361068b2e4c3c.tar.xz | |
Fixed stupid error on my part that broke clickable names in chat history
Diffstat (limited to 'linden/indra/newview')
| -rw-r--r-- | linden/indra/newview/llfloaterchat.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
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: " |