summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorSamuel Kolb <skolb@lindenlab.com>2009-12-15 13:05:35 -0800
committerSamuel Kolb <skolb@lindenlab.com>2009-12-15 13:05:35 -0800
commitc2554b6f286e1bb8fa85ba68d2de56ccc88291b8 (patch)
tree4e44b691d95cd152c1f151ace663aea5a648c39e /indra
parent82425a230c5ac7c0ca8a9ae55a1addadca9d99e9 (diff)
merge
Diffstat (limited to 'indra')
-rw-r--r--indra/media_plugins/webkit/media_plugin_webkit.cpp2
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);