diff options
| author | Simon Linden <simon@lindenlab.com> | 2014-07-18 22:28:33 +0000 |
|---|---|---|
| committer | Simon Linden <simon@lindenlab.com> | 2014-07-18 22:28:33 +0000 |
| commit | 7714c7679da7c6c28c3f3f09af6b586a680dc26c (patch) | |
| tree | f14c766b090f50cbb866123305f676e831ef483b /indra/llui/lltextutil.cpp | |
| parent | 1655887f30e40ea390b6dca9f64ac5e84309be05 (diff) | |
| parent | ff3827f278d2d53f565bc585edc4db5bc5e5dc38 (diff) | |
Merge in downstream viewer-tiger
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) |