diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 14:32:32 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 14:32:32 -0800 |
commit | e62ee60e11b0056cb38ec180d1e4ee3891636177 (patch) | |
tree | c1f26801e3a1aa5cbbf7a918d5871bd0616442ac /indra/media_plugins/webkit/media_plugin_webkit.cpp | |
parent | 89a8182c2cd8d04b85c70d82f654714b83afebb8 (diff) | |
parent | 9cf8c3e654f38745c8a94cbd85609a17f482266a (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 276ad39dfb..ae4f4d810f 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); |