diff options
| author | callum <none@none> | 2010-11-30 14:07:16 -0800 |
|---|---|---|
| committer | callum <none@none> | 2010-11-30 14:07:16 -0800 |
| commit | 1345cbb0ca715de8bc98a1ccffd93f29d749500a (patch) | |
| tree | 6e6a6d79166fb83ae7aa0ad25cc80d3cc23be910 /indra/media_plugins/webkit/media_plugin_webkit.cpp | |
| parent | 60d4abc9d3c35d89b8e30210e855bc0213db75be (diff) | |
SOCIAL-299 FIX Add *.lindenlab.com to trusted certificate authorities in WebKit
Reviewed by CB
Diffstat (limited to 'indra/media_plugins/webkit/media_plugin_webkit.cpp')
| -rw-r--r-- | indra/media_plugins/webkit/media_plugin_webkit.cpp | 8 |
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 5dbc2f9fdf..8b70c15b27 100644 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -1231,6 +1231,14 @@ void MediaPluginWebKit::receiveMessage(const char *message_string) llwarns << "Ignoring ignore_ssl_cert_errors message (llqtwebkit version is too old)." << llendl; #endif } + else if(message_name == "set_certificate_file_path") + { +#if LLQTWEBKIT_API_VERSION >= 3 + LLQtWebKit::getInstance()->setCAFile( message_in.getValue("path") ); +#else + llwarns << "Ignoring set_certificate_file_path message (llqtwebkit version is too old)." << llendl; +#endif + } else if(message_name == "init_history") { // Initialize browser history |