summaryrefslogtreecommitdiff
path: root/indra/newview/llchathistory.cpp
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2010-10-28 17:57:32 +0300
committerVadim ProductEngine <vsavchuk@productengine.com>2010-10-28 17:57:32 +0300
commitd42b1c3b215e8e30975c287de935830efd1e4d0d (patch)
treeb0c5a03d8bc68e2e095f67f363abaaf40b795c8f /indra/newview/llchathistory.cpp
parent158e647247f67344a5d7a9dde6ccc80bad615c9a (diff)
STORM-488 FIXED Place profile was opened instead of Object profile if used clicked an object SLURL in the plain text nearby chat log.
The reason is the same as in STORM-390: a bug in LLTextBase which leads to ignoring link href specified for a link segment if the segment contains an URL (and the <nolink>...</nolink> clause is treated as such). The workaround is to explicitly disallow parsing URLs in a link segment by setting its "is_link" parameter to "true".
Diffstat (limited to 'indra/newview/llchathistory.cpp')
-rw-r--r--indra/newview/llchathistory.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index cb5cf4a61d..87297852c3 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)