diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2016-05-10 14:59:33 -0700 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2016-05-10 14:59:33 -0700 |
| commit | df55966b112142e194f07386a3673f395ec792fc (patch) | |
| tree | 481234ace0fa5a95c0f135b7aa35872a8fa1946d /indra/llui/llurlaction.cpp | |
| parent | a670914c6d43dcde0677680375f53f8a67a89cf6 (diff) | |
| parent | 94559950a2c670990db56bd74e65d26652421b8c (diff) | |
merge
Diffstat (limited to 'indra/llui/llurlaction.cpp')
| -rwxr-xr-x | indra/llui/llurlaction.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/llurlaction.cpp b/indra/llui/llurlaction.cpp index 12537d9dd1..027a3e3a64 100755 --- a/indra/llui/llurlaction.cpp +++ b/indra/llui/llurlaction.cpp @@ -83,12 +83,13 @@ void LLUrlAction::openURLExternal(std::string url) } } -void LLUrlAction::executeSLURL(std::string url) +bool LLUrlAction::executeSLURL(std::string url, bool trusted_content) { if (sExecuteSLURLCallback) { - sExecuteSLURLCallback(url ,true); + return sExecuteSLURLCallback(url, trusted_content); } + return false; } void LLUrlAction::clickAction(std::string url, bool trusted_content) |