diff options
| author | maxim@mnikolenko <maxim@mnikolenko> | 2014-05-28 13:20:12 +0300 |
|---|---|---|
| committer | maxim@mnikolenko <maxim@mnikolenko> | 2014-05-28 13:20:12 +0300 |
| commit | 72dba8742c3120fcb76b42aa6ede796bdad8554d (patch) | |
| tree | d33890b434ad892496e5fc70b0f2cdad7c69907a /indra/llui/lltextbase.cpp | |
| parent | c84217cc5bf49354b39ea3521e4805c791a15c8c (diff) | |
MAINT-4070 FIXED Use icon in urls when content is trusted.
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rwxr-xr-x | indra/llui/lltextbase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 30e6c6248e..8906a6e736 100755 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -2038,7 +2038,7 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para LLUrlMatch match; std::string text = new_text; while ( LLUrlRegistry::instance().findUrl(text, match, - boost::bind(&LLTextBase::replaceUrl, this, _1, _2, _3)) ) + boost::bind(&LLTextBase::replaceUrl, this, _1, _2, _3),isContentTrusted())) { start = match.getStart(); end = match.getEnd()+1; @@ -2075,7 +2075,7 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para } } - LLTextUtil::processUrlMatch(&match,this); + LLTextUtil::processUrlMatch(&match,this,isContentTrusted()); // move on to the rest of the text after the Url if (end < (S32)text.length()) |