diff options
| author | Aura Linden <aura@lindenlab.com> | 2014-06-18 11:32:53 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2014-06-18 11:32:53 -0700 |
| commit | a4d60d6721c62511ba7a26352e3b5d35cd0dbb94 (patch) | |
| tree | 082fa1927273936fa07b9b500a7a3548833cbb6f /indra/llui/lltextutil.cpp | |
| parent | 4bcf2079f15a09d40f1d7aa61b2768cc54dc427a (diff) | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
Pulled merge from 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) |