summaryrefslogtreecommitdiff
path: root/indra/newview/llurldispatcher.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2014-04-03 18:56:46 -0400
committerMonty Brandenberg <monty@lindenlab.com>2014-04-03 18:56:46 -0400
commitd7481cd07c3e0b5eed54ff6a3539406d09ed0669 (patch)
tree7e0d2a2a9733784f16518b977423deb225021651 /indra/newview/llurldispatcher.cpp
parent076761a03d7cb8b53e6e3d4f2120091eabeba37a (diff)
parent31a3a3da5db077c4d9b8fe06a18de98c822db6ab (diff)
Merge. Refresh from viewer-release after 3.7.4 release.
Diffstat (limited to 'indra/newview/llurldispatcher.cpp')
-rwxr-xr-xindra/newview/llurldispatcher.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp
index 00b15a5f26..0c34db39b5 100755
--- a/indra/newview/llurldispatcher.cpp
+++ b/indra/newview/llurldispatcher.cpp
@@ -307,7 +307,7 @@ bool LLURLDispatcher::dispatchRightClick(const std::string& slurl)
}
// static
-bool LLURLDispatcher::dispatchFromTextEditor(const std::string& slurl)
+bool LLURLDispatcher::dispatchFromTextEditor(const std::string& slurl, bool trusted_content)
{
// *NOTE: Text editors are considered sources of trusted URLs
// in order to make avatar profile links in chat history work.
@@ -315,9 +315,9 @@ bool LLURLDispatcher::dispatchFromTextEditor(const std::string& slurl)
// receiving resident will see it and must affirmatively
// 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);
+ return LLURLDispatcherImpl::dispatch(LLSLURL(slurl), "clicked", web, trusted_content);
}