diff options
author | Merov Linden <merov@lindenlab.com> | 2010-08-25 11:11:58 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-08-25 11:11:58 -0700 |
commit | 6ed18227535e1b76ae650efdacfb14c1a884fc1a (patch) | |
tree | 4f14f77ac9930ae8c32c48c027e905b2684d6fed /indra/llui/lltextbase.cpp | |
parent | 5361e6826f186783c95e01804cec97be37910bec (diff) | |
parent | 6fcde580c3a2e6cc62bfab52bd47cae8726c56d4 (diff) |
Sync with viewer-development
Diffstat (limited to 'indra/llui/lltextbase.cpp')
-rw-r--r-- | indra/llui/lltextbase.cpp | 7 |
1 files 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()) { |