From f3d4643b5907dec71183e4f0927c0e5a6fc48c70 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Thu, 28 Oct 2010 23:03:09 +0300
Subject: [PATCH] STORM-489 FIXED <nolink>'ed text rendered as URL
Changes:
* Suppressed URLs in object (sender) names of nearby chat messages loaded from history.
* Fixed text between <nolink>...</nolink> text being rendered as URL
(hand cursor on hover, context menu, context menu, opening Places SP on click).
---
indra/llui/llurlentry.cpp | 3 ++-
indra/newview/llchathistory.cpp | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index f49dfec82b0..84678ef4dbd 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -989,7 +989,8 @@ std::string LLUrlEntryNoLink::getLabel(const std::string &url, const LLUrlLabelC
LLStyle::Params LLUrlEntryNoLink::getStyle() const
{
- return LLStyle::Params();
+ // Don't render as URL (i.e. no context menu or hand cursor).
+ return LLStyle::Params().is_link(false);
}
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 87297852c30..3dc6e786d31 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -805,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);
}
}
}
--
GitLab