summaryrefslogtreecommitdiff
path: root/indra/llui/llurlaction.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llui/llurlaction.cpp')
-rwxr-xr-xindra/llui/llurlaction.cpp12
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)
{