summaryrefslogtreecommitdiff
path: root/indra/newview/llurldispatcher.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llurldispatcher.cpp')
-rwxr-xr-xindra/newview/llurldispatcher.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp
index 00b15a5f26..6e8ee38a2f 100755
--- a/indra/newview/llurldispatcher.cpp
+++ b/indra/newview/llurldispatcher.cpp
@@ -307,6 +307,8 @@ bool LLURLDispatcher::dispatchRightClick(const std::string& slurl)
}
// static
+// MAINT-535 reversion test
+// bool LLURLDispatcher::dispatchFromTextEditor(const std::string& slurl, bool trusted_content)
bool LLURLDispatcher::dispatchFromTextEditor(const std::string& slurl)
{
// *NOTE: Text editors are considered sources of trusted URLs
@@ -316,8 +318,12 @@ bool LLURLDispatcher::dispatchFromTextEditor(const std::string& slurl)
// click on it.
// *TODO: Make this trust model more refined. JC
const bool trusted_browser = true;
+
LLMediaCtrl* web = NULL;
return LLURLDispatcherImpl::dispatch(LLSLURL(slurl), "clicked", web, trusted_browser);
+
+ // MAINT-535 reversion test
+ //return LLURLDispatcherImpl::dispatch(LLSLURL(slurl), "clicked", web, trusted_content);
}