diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-18 10:16:53 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-18 10:16:53 -0500 |
| commit | ad6d0e3bb766c737b1e9bbd9d006391cc8bcc085 (patch) | |
| tree | 4f1549d0308fef5e65eb43e3d8e6f049f09f3abf /indra/media_plugins/webkit | |
| parent | 0561b09a7d9d8fb0137bf5ec1d25120aac23c312 (diff) | |
| parent | ad65fa11acdf7f655f32e6ca43b2f2bc997ef1e6 (diff) | |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/media_plugins/webkit')
| -rw-r--r-- | indra/media_plugins/webkit/media_plugin_webkit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp index 2ce295a4b2..7be2385fd5 100644 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -212,8 +212,8 @@ private: // Enable plugins LLQtWebKit::getInstance()->enablePlugins(true); #elif LL_LINUX - // Disable plugins - LLQtWebKit::getInstance()->enablePlugins(false); + // Enable plugins + LLQtWebKit::getInstance()->enablePlugins(true); #endif // Enable cookies LLQtWebKit::getInstance()->enableCookies( true ); |