diff options
| author | Chris Baker <baker@lindenlab.com> | 2014-06-16 21:15:41 +0000 |
|---|---|---|
| committer | Chris Baker <baker@lindenlab.com> | 2014-06-16 21:15:41 +0000 |
| commit | ee14005a2aea89b2988fa0a5060f38b669e45389 (patch) | |
| tree | 3b9930089be344a9c25172f3ca4be0fbf412ba17 /indra/llui/lltextutil.cpp | |
| parent | a92dbb592b338f48f7b75b68a9da511dc95279f9 (diff) | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
viewer-release merge
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) |