diff options
| author | simon <none@none> | 2014-01-10 13:15:19 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-01-10 13:15:19 -0800 |
| commit | cfadbe631fbf845db8e26793613dea37ef08d11c (patch) | |
| tree | 1283cd746e6a1b0d0ffc214e8cc6863f1202c226 /indra/llui/llurlaction.cpp | |
| parent | f291995dac53c2aba9d79aef8b6cd91a5c836e9f (diff) | |
Revert earlier back-out for MAINT-535 ... it's back in
Diffstat (limited to 'indra/llui/llurlaction.cpp')
| -rwxr-xr-x | indra/llui/llurlaction.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/indra/llui/llurlaction.cpp b/indra/llui/llurlaction.cpp index e392a88b6a..12537d9dd1 100755 --- a/indra/llui/llurlaction.cpp +++ b/indra/llui/llurlaction.cpp @@ -87,20 +87,14 @@ void LLUrlAction::executeSLURL(std::string url) { if (sExecuteSLURLCallback) { - sExecuteSLURLCallback(url); - // MAINT-535 reversion test - //sExecuteSLURLCallback(url ,true); + sExecuteSLURLCallback(url ,true); } } -// MAINT-535 reversion test -//void LLUrlAction::clickAction(std::string url, bool trusted_content) -void LLUrlAction::clickAction(std::string url) +void LLUrlAction::clickAction(std::string url, bool trusted_content) { // Try to handle as SLURL first, then http Url - // MAINT-535 reversion test - // if ( (sExecuteSLURLCallback) && !sExecuteSLURLCallback(url, trusted_content) ) - if ( (sExecuteSLURLCallback) && !sExecuteSLURLCallback(url) ) + if ( (sExecuteSLURLCallback) && !sExecuteSLURLCallback(url, trusted_content) ) { if (sOpenURLCallback) { |