diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-06-16 13:22:19 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-06-16 13:22:19 -0700 |
| commit | f11dd1d8a3dc4ba9a3c23563126e11ee971e219f (patch) | |
| tree | cc2798f96eafb50f42d097da7ac53e152777c402 /indra/llui/lltextutil.cpp | |
| parent | 483bd134162ffeef8760173aa223daee81c0f9e3 (diff) | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
Merge with head of viewer-release
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) |