diff options
author | Logan Dethrow <log@lindenlab.com> | 2011-08-08 18:09:11 -0400 |
---|---|---|
committer | Logan Dethrow <log@lindenlab.com> | 2011-08-08 18:09:11 -0400 |
commit | 1fa2afbe2007690612f360eff3603a353ee95672 (patch) | |
tree | bd5a48c23a2280afcd0115cc6dd1d70764162b1c /indra/media_plugins/webkit/media_plugin_webkit.cpp | |
parent | fe14e50a45a450cd7bcdfe73a8bbda03c018053f (diff) | |
parent | 4ab5831b3eed23c06d2ccd3cf55f6c018613c788 (diff) |
merge
Diffstat (limited to 'indra/media_plugins/webkit/media_plugin_webkit.cpp')
-rw-r--r-- | indra/media_plugins/webkit/media_plugin_webkit.cpp | 2 |
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 |