From 97b331420093fdb54ea6de8a76c7211cb1aaf8a7 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Wed, 25 Aug 2010 01:19:44 +0100
Subject: [PATCH] EXT-8398/EXT-8300 FIXED Avatar icons displaced from SLURL
profile links
Icon was being inserted before any text preceding the link.
Reviewed by Richard.
---
indra/llui/lltextbase.cpp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 60c313b6ce..b95596fa70 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1611,9 +1611,6 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para
while ( LLUrlRegistry::instance().findUrl(text, match,
boost::bind(&LLTextBase::replaceUrlLabel, this, _1, _2)) )
{
-
- LLTextUtil::processUrlMatch(&match,this);
-
start = match.getStart();
end = match.getEnd()+1;
@@ -1638,6 +1635,10 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para
std::string subtext=text.substr(0,start);
appendAndHighlightText(subtext, part, style_params);
}
+
+ // inserts an avatar icon preceding the Url if appropriate
+ LLTextUtil::processUrlMatch(&match,this);
+
// output the styled Url (unless we've been asked to suppress hyperlinking)
if (match.isLinkDisabled())
{
--
GitLab