diff options
| author | callum <none@none> | 2009-12-15 17:53:03 -0800 |
|---|---|---|
| committer | callum <none@none> | 2009-12-15 17:53:03 -0800 |
| commit | b7747a815f1fb7ee49804b6b2daf2e347b27f7a5 (patch) | |
| tree | 7edef8c608cc99cb0e657694d259598294858851 /indra/media_plugins | |
| parent | f923f896bca0d0d8459c35a5ef8e0d0171cbe664 (diff) | |
| parent | fc40740e1e5a7fcb1ed8bf3b4b6eaffe7d3d9c07 (diff) | |
Merge with tip before push
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 76e2c080be..707edaa3d6 100644 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -211,7 +211,7 @@ private: LLQtWebKit::getInstance()->enablePlugins(true); #elif LL_DARWIN // Disable plugins - LLQtWebKit::getInstance()->enablePlugins(false); + LLQtWebKit::getInstance()->enablePlugins(true); #elif LL_LINUX // Disable plugins LLQtWebKit::getInstance()->enablePlugins(false); |