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/lltextutil.cpp | |
| parent | c84217cc5bf49354b39ea3521e4805c791a15c8c (diff) | |
MAINT-4070 FIXED Use icon in urls when content is trusted.
Diffstat (limited to 'indra/llui/lltextutil.cpp')
| -rwxr-xr-x | indra/llui/lltextutil.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lltextutil.cpp b/indra/llui/lltextutil.cpp index 4df2c3363f..fff04b34f2 100755 --- a/indra/llui/lltextutil.cpp +++ b/indra/llui/lltextutil.cpp @@ -72,7 +72,7 @@ const std::string& LLTextUtil::formatPhoneNumber(const std::string& phone_str) return formatted_phone_str; } -bool LLTextUtil::processUrlMatch(LLUrlMatch* match,LLTextBase* text_base) +bool LLTextUtil::processUrlMatch(LLUrlMatch* match,LLTextBase* text_base, bool is_content_trusted) { if (match == 0 || text_base == 0) return false; @@ -85,7 +85,7 @@ bool LLTextUtil::processUrlMatch(LLUrlMatch* match,LLTextBase* text_base) } // output an optional icon before the Url - if (!match->getIcon().empty() ) + if (is_content_trusted && !match->getIcon().empty() ) { LLUIImagePtr image = LLUI::getUIImage(match->getIcon()); if (image) |