From ac9543be9eb6e3c4b929142d0d2758ebf1885ac8 Mon Sep 17 00:00:00 2001 From: Vladimir Pchelko Date: Thu, 10 Jun 2010 16:32:41 +0300 Subject: EXT-6654 FIXED Using escaped (LLURI::escape()) text for objects link. reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/543/ --HG-- branch : product-engine --- indra/newview/llchathistory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llchathistory.cpp') 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("" + chat.mFromName + "" + delimiter, false, link_params); } -- cgit v1.3 From 33d91c0a396632d55f0b322f10d1594ee2990e1d Mon Sep 17 00:00:00 2001 From: Igor Borovkov Date: Fri, 11 Jun 2010 19:21:26 +0300 Subject: EXT-7137 FIXED nearby chat messages coming from non-null id with from name "Second Life" are no longer considered "system messages" Messages coming from objects named "Second Life" were mistaken for messages coming from system under the name "Second Life". It is impossible to distinguish using the from_id and from_name two cases: - messages coming from system under the name "Second Life" but under the id of an object - messages comding from object named "Second Life" Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/556/ --HG-- branch : product-engine --- indra/newview/llchathistory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llchathistory.cpp') diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 961969a5c5..18c69b5130 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -243,7 +243,7 @@ public: gCacheName->get(mAvatarID, FALSE, boost::bind(&LLChatHistoryHeader::nameUpdatedCallback, this, _1, _2, _3, _4)); //*TODO overly defensive thing, source type should be maintained out there - if((chat.mFromID.isNull() && chat.mFromName.empty()) || chat.mFromName == SYSTEM_FROM) + if((chat.mFromID.isNull() && chat.mFromName.empty()) || chat.mFromName == SYSTEM_FROM && chat.mFromID.isNull()) { mSourceType = CHAT_SOURCE_SYSTEM; } -- cgit v1.3