diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-06-23 10:55:32 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-06-23 10:55:32 -0700 |
| commit | 70cf100f747dd3511c5e1dda668ddb97487b98ab (patch) | |
| tree | 5108f22422673308bbb705ad92becec254deee5c /indra/newview/llchathistory.cpp | |
| parent | 63be74f57c5a520e308a90d44e58ae5e5ba2e6bf (diff) | |
| parent | 6c57abb295447f2b44eb833cb77fa718dc2b1118 (diff) | |
Merged from viewer-release
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index ab97dbb695..ac12bffdfb 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -666,13 +666,13 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL slurl = region_slurl.getLocationString(); } } - url += "&slurl=" + slurl; + url += "&slurl=" + LLURI::escape(slurl); // set the link for the object name to be the objectim SLapp // (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 = LLURI::escape(url); + link_params.link_href = url; mEditor->appendText("<nolink>" + chat.mFromName + "</nolink>" + delimiter, false, link_params); } |