From 190e3e8c2f2fbe3755a6536029e6c0a2d4f25bb8 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Sun, 21 Apr 2019 22:06:33 -0400 Subject: [PATCH] Fix link replacement being enforced improperly, thanks Beware! --- indra/llui/lltexteditor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index 14f451d35..6bdef7142 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -4274,7 +4274,7 @@ void LLTextEditor::appendText(const std::string &new_text, bool allow_undo, bool return; std::string text = prepend_newline && !mWText.empty() ? ('\n' + new_text) : new_text; - appendTextImpl(text, style); + appendTextImpl(text, style, force_replace_links); if (!allow_undo) { @@ -4340,7 +4340,7 @@ void LLTextEditor::appendTextImpl(const std::string &new_text, const LLStyleSP s auto url = match.getUrl(); const auto& label = match.getLabel(); - if (force_replace_links || replace_links || url == label) + if (force_replace_links || url == label) { // add icon before url if need /* Singu TODO: Icons next to links?