diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-04 15:37:31 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-04 15:37:31 -0400 |
| commit | 94c171d89bae06d0bc259255a917db892019c369 (patch) | |
| tree | 7ad345f7accb18308d75367ed40326131d229cab /indra/media_plugins | |
| parent | 4ba18501ea2f8c45b2366b6caaeeb7c9ffe6038f (diff) | |
| parent | 468d81048602d5369209ef2f945b63db381423eb (diff) | |
merge changes for storm-1355
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 |