summaryrefslogtreecommitdiff
path: root/indra/media_plugins/webkit
diff options
context:
space:
mode:
authorcallum <none@none>2010-11-05 17:06:21 -0700
committercallum <none@none>2010-11-05 17:06:21 -0700
commitce613ce398c3430beab13be6a8016e4c8f5dcab1 (patch)
treeadc059012c0bc81908bf8b6cba41c7fcaa8b242a /indra/media_plugins/webkit
parent68d27467610610f8067a74fdecdfad595e6662b4 (diff)
EXP-378 FIX Disable SSL cert errors in LLQtWebkit for testing purposes
(Monroe's code - I made a patch and copied it over from viewer-skylight branch)
Diffstat (limited to 'indra/media_plugins/webkit')
-rw-r--r--indra/media_plugins/webkit/media_plugin_webkit.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp
index bd1a44a930..466b4732b1 100644
--- a/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -1182,6 +1182,14 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
mUserAgent = message_in.getValue("user_agent");
LLQtWebKit::getInstance()->setBrowserAgentId( mUserAgent );
}
+ else if(message_name == "ignore_ssl_cert_errors")
+ {
+#if LLQTWEBKIT_API_VERSION >= 3
+ LLQtWebKit::getInstance()->setIgnoreSSLCertErrors( message_in.getValueBoolean("ignore") );
+#else
+ llwarns << "Ignoring ignore_ssl_cert_errors message (llqtwebkit version is too old)." << llendl;
+#endif
+ }
else if(message_name == "init_history")
{
// Initialize browser history