summaryrefslogtreecommitdiff
path: root/indra/media_plugins/webkit/media_plugin_webkit.cpp
diff options
context:
space:
mode:
authorskolb <none@none>2009-10-12 11:24:14 -0700
committerskolb <none@none>2009-10-12 11:24:14 -0700
commit1d63b145481021c5d0ed16bd0c10c320170d0cf5 (patch)
tree1ce48042a073b62504367570d13c676f24493ea1 /indra/media_plugins/webkit/media_plugin_webkit.cpp
parentd4b2897700c66354413af42ab055bd1aaa47f91c (diff)
Merge changes to llpanelmediasettingsgeneral to handle reset button
Diffstat (limited to 'indra/media_plugins/webkit/media_plugin_webkit.cpp')
-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 eb2457744a..5914399638 100644
--- a/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -147,7 +147,7 @@ private:
#if LL_WINDOWS
// Enable plugins
- LLQtWebKit::getInstance()->enablePlugins(false);
+ LLQtWebKit::getInstance()->enablePlugins(true);
#elif LL_DARWIN
// Disable plugins
LLQtWebKit::getInstance()->enablePlugins(false);