diff options
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/newview/llfloaterchat.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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& | |||
| 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() && |
| 217 | (line.length() > chat.mFromName.length() && | 217 | (line.length() > chat.mFromName.length() && |
| 218 | (line.find(chat.mFromName,0) == 4 || line.find(chat.mFromName,0) == 0))) | 218 | (line.find(chat.mFromName,0) == 4 || line.find(chat.mFromName,0) == 0)) && |
| 219 | color == gSavedSettings.getColor4("ObjectIMColor")) // hack to make sure IMs in chat history don't hightlight | ||
| 219 | { | 220 | { |
| 220 | std::string start_line; | 221 | std::string start_line; |
| 221 | if (line.find(chat.mFromName,0) == 4) // IMs are prefaced with "IM: " | 222 | if (line.find(chat.mFromName,0) == 4) // IMs are prefaced with "IM: " |