diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-08-12 14:53:25 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-08-12 14:53:25 -0700 |
| commit | 10ec0049125317d5c0bdd1bf89b96a54a9b2d873 (patch) | |
| tree | 97efa1a6731aef7e703e1a6ca2eaa4a01dbb6fa8 /indra/media_plugins | |
| parent | e69efc8369a65008d41155717761fbaec0e309c5 (diff) | |
| parent | 25f1653ca0a25c73b3c0649ee5bb7c65e5378eac (diff) | |
merge from viewer-experience
Diffstat (limited to 'indra/media_plugins')
| -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 |