livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge fix #2: Fix optional icon positioning in LLTextBase 

Icon needs to be prepending the text if we either want it to be on the left or
the URL itself is trusted. On the other hand, only append the icon if we either
want it to be on the right side of the URL (restoring behavior prior V3.7.25)
AND if the URL itself is not trusted (we would create a duplicate trusted icon
otherwise).
Ansariel 2015-02-25 10:48:05 +01:00
parent e8414d39c6
commit 24eda00b2e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/llui/lltextbase.cpp
View File

@ -2263,14 +2263,17 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para
appendAndHighlightText(subtext, part, style_params);
}
// add icon before url if need
// <FS:Ansariel> Optional icon position
if (mIconPositioning == LLTextBaseEnums::LEFT)
//LLTextUtil::processUrlMatch(&match,this,isContentTrusted() || match.isTrusted());
if (mIconPositioning == LLTextBaseEnums::LEFT || match.isTrusted())
{
LLTextUtil::processUrlMatch(&match,this,isContentTrusted() || match.isTrusted());
}
// </FS:Ansariel> Optional icon position
// output the styled Url
//appendAndHighlightTextImpl(label, part, link_params, match.underlineOnHoverOnly());
// <FS:CR> FIRE-11437 - Don't supress font style for chat history name links
//appendAndHighlightTextImpl(match.getLabel(), part, link_params, match.underlineOnHoverOnly());
appendAndHighlightTextImpl(match.getLabel(), part, link_params,
@ -2289,8 +2292,7 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para
}
// <FS:Ansariel> Optional icon position
//LLTextUtil::processUrlMatch(&match,this,isContentTrusted());
if (mIconPositioning == LLTextBaseEnums::RIGHT)
if (mIconPositioning == LLTextBaseEnums::RIGHT && !match.isTrusted())
{
LLTextUtil::processUrlMatch(&match,this,isContentTrusted());
}