diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-08 16:47:46 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-08 16:47:46 -0500 |
| commit | b657516f72f016a918e0ff627105dd380a94394c (patch) | |
| tree | 7d30ace2d3cba42c5f7de1c3dd23748e31b2803f /indra/newview/llchathistory.cpp | |
| parent | 451d115c1009ded2b2d74efefbe0611c62343eed (diff) | |
| parent | c446062bd3bd3f172b20f22f2086cea962fb7278 (diff) | |
pull beta changes back to development
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 9153f7325f..0f7e9313a9 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -790,8 +790,9 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL // (don't let object names with hyperlinks override our objectim Url) LLStyle::Params link_params(style_params); link_params.color.control = "HTMLLinkColor"; + link_params.is_link = true; link_params.link_href = url; - mEditor->appendText("<nolink>" + chat.mFromName + "</nolink>" + delimiter, + mEditor->appendText(chat.mFromName + delimiter, false, link_params); } else if ( chat.mFromName != SYSTEM_FROM && chat.mFromID.notNull() && !message_from_log) @@ -804,7 +805,7 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL } else { - mEditor->appendText(chat.mFromName + delimiter, false, style_params); + mEditor->appendText("<nolink>" + chat.mFromName + "</nolink>" + delimiter, false, style_params); } } } |