summaryrefslogtreecommitdiff
path: root/indra/media_plugins/webkit
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2011-07-29 19:48:52 -0700
committerRoxie Linden <roxie@lindenlab.com>2011-07-29 19:48:52 -0700
commit468d81048602d5369209ef2f945b63db381423eb (patch)
tree9b2ac7400c297f4988d9b42ac339cdde2d56bc58 /indra/media_plugins/webkit
parentfcf0659fc0f638e5d26904a1e647dfd25c8f6588 (diff)
Include some certs that were missed in the latest cert update. Specifically,
paypal had a verisign -2 CA cert, and the new trust list only includes -3. Also, disable use of the system cert store. Just use our list.
Diffstat (limited to 'indra/media_plugins/webkit')
-rw-r--r--indra/media_plugins/webkit/media_plugin_webkit.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp
index fca071c628..96f642f2a0 100644
--- a/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -1332,7 +1332,7 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
else if(message_name == "add_certificate_file_path")
{
#if LLQTWEBKIT_API_VERSION >= 6
- LLQtWebKit::getInstance()->addCAFile( message_in.getValue("path") );
+ LLQtWebKit::getInstance()->setCAFile( message_in.getValue("path") );
#else
llwarns << "Ignoring add_certificate_file_path message (llqtwebkit version is too old)." << llendl;
#endif