diff options
| author | simon <none@none> | 2014-01-09 10:56:44 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-01-09 10:56:44 -0800 |
| commit | ade7faae5802c1e68bb2b09ba9e126bbfa2cfb37 (patch) | |
| tree | 75176cac336eb01344aa8b75e8763178c23e4e22 /indra/llui/llurlaction.cpp | |
| parent | e89bda2586a8f6054b3822900aaaedf5c6934b75 (diff) | |
| parent | 6b4a35723006b7dec25b7f0677b0dae8ce88008c (diff) | |
Merge downstream -bear
Diffstat (limited to 'indra/llui/llurlaction.cpp')
| -rwxr-xr-x | indra/llui/llurlaction.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/llui/llurlaction.cpp b/indra/llui/llurlaction.cpp index 12537d9dd1..e392a88b6a 100755 --- a/indra/llui/llurlaction.cpp +++ b/indra/llui/llurlaction.cpp @@ -87,14 +87,20 @@ void LLUrlAction::executeSLURL(std::string url) { if (sExecuteSLURLCallback) { - sExecuteSLURLCallback(url ,true); + sExecuteSLURLCallback(url); + // MAINT-535 reversion test + //sExecuteSLURLCallback(url ,true); } } -void LLUrlAction::clickAction(std::string url, bool trusted_content) +// MAINT-535 reversion test +//void LLUrlAction::clickAction(std::string url, bool trusted_content) +void LLUrlAction::clickAction(std::string url) { // Try to handle as SLURL first, then http Url - if ( (sExecuteSLURLCallback) && !sExecuteSLURLCallback(url, trusted_content) ) + // MAINT-535 reversion test + // if ( (sExecuteSLURLCallback) && !sExecuteSLURLCallback(url, trusted_content) ) + if ( (sExecuteSLURLCallback) && !sExecuteSLURLCallback(url) ) { if (sOpenURLCallback) { |