diff options
| author | simon <none@none> | 2014-01-07 15:18:29 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-01-07 15:18:29 -0800 |
| commit | f291995dac53c2aba9d79aef8b6cd91a5c836e9f (patch) | |
| tree | 8dd6b3b8dcde04580163c2f96ff03ac2ec80ce44 /indra/llui/llurlaction.cpp | |
| parent | 2a1098552e071c625a8c1614a331e9557212d380 (diff) | |
Revert changes made for MAINT-535 to test in a release cohort.
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) { |