summaryrefslogtreecommitdiff
path: root/indra/newview/llchathistory.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-06-11 11:27:36 -0400
committerLoren Shih <seraph@lindenlab.com>2010-06-11 11:27:36 -0400
commit8e725a8694f8537d696a6943ea2323c56a5fa169 (patch)
tree24d34b7bd9446919fa86d2d462c8230d02b638b0 /indra/newview/llchathistory.cpp
parent59b4f7e25899e5f14cc6d1eb1f7f683ae6821657 (diff)
parent0c8164b8947eee7b43ba0452821a3ff6d9f9dd38 (diff)
automated merge
Diffstat (limited to 'indra/newview/llchathistory.cpp')
-rw-r--r--indra/newview/llchathistory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 0bd03571da..961969a5c5 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -667,7 +667,7 @@ 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.link_href = url;
+ link_params.link_href = LLURI::escape(url);
mEditor->appendText("<nolink>" + chat.mFromName + "</nolink>" + delimiter,
false, link_params);
}