Skip to content
Snippets Groups Projects
Commit 6ed18227 authored by Merov Linden's avatar Merov Linden
Browse files

Sync with viewer-development

parents 5361e682 6fcde580
Branches
Tags
No related merge requests found
...@@ -1611,9 +1611,6 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para ...@@ -1611,9 +1611,6 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para
while ( LLUrlRegistry::instance().findUrl(text, match, while ( LLUrlRegistry::instance().findUrl(text, match,
boost::bind(&LLTextBase::replaceUrlLabel, this, _1, _2)) ) boost::bind(&LLTextBase::replaceUrlLabel, this, _1, _2)) )
{ {
LLTextUtil::processUrlMatch(&match,this);
start = match.getStart(); start = match.getStart();
end = match.getEnd()+1; end = match.getEnd()+1;
...@@ -1638,6 +1635,10 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para ...@@ -1638,6 +1635,10 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para
std::string subtext=text.substr(0,start); std::string subtext=text.substr(0,start);
appendAndHighlightText(subtext, part, style_params); 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) // output the styled Url (unless we've been asked to suppress hyperlinking)
if (match.isLinkDisabled()) if (match.isLinkDisabled())
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment