diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-10 15:47:27 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-10 15:47:27 -0400 |
| commit | 0f3ba54a7ececa4d6f7c247a3ffa3a2f9572268e (patch) | |
| tree | c7d3d7cc7a6d1a22ad7b69f45ade31ef4780f9e6 /indra/llui/llurlaction.cpp | |
| parent | 2b4d3fff706d098076bb6c0a7dce2ca35b83300f (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
merge changes for 3.7.3-release
Diffstat (limited to 'indra/llui/llurlaction.cpp')
| -rwxr-xr-x | indra/llui/llurlaction.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llurlaction.cpp b/indra/llui/llurlaction.cpp index 23e574cb74..12537d9dd1 100755 --- a/indra/llui/llurlaction.cpp +++ b/indra/llui/llurlaction.cpp @@ -87,14 +87,14 @@ void LLUrlAction::executeSLURL(std::string url) { if (sExecuteSLURLCallback) { - sExecuteSLURLCallback(url); + sExecuteSLURLCallback(url ,true); } } -void LLUrlAction::clickAction(std::string url) +void LLUrlAction::clickAction(std::string url, bool trusted_content) { // Try to handle as SLURL first, then http Url - if ( (sExecuteSLURLCallback) && !sExecuteSLURLCallback(url) ) + if ( (sExecuteSLURLCallback) && !sExecuteSLURLCallback(url, trusted_content) ) { if (sOpenURLCallback) { |