summaryrefslogtreecommitdiff
path: root/indra/media_plugins/webkit/media_plugin_webkit.cpp
diff options
context:
space:
mode:
authorEli Linden <eli@lindenlab.com>2010-03-12 16:12:34 -0800
committerEli Linden <eli@lindenlab.com>2010-03-12 16:12:34 -0800
commit8c33d5aeccb6d01ab59777a3b4bb3baaae4af8b4 (patch)
tree7324c3b2edfabc6f728791ce055eeef74643b197 /indra/media_plugins/webkit/media_plugin_webkit.cpp
parent69efa833f7e21c13b16b72d603405651fe0d0241 (diff)
parentd5e685306ce100a62db06a36dfef58f3beb22b7a (diff)
Merge
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 e66ac3049f..afde904be6 100644
--- a/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -45,7 +45,7 @@
// set to 1 if you're using the version of llqtwebkit that's QPixmap-ified
#if LL_LINUX
-# define LL_QTWEBKIT_USES_PIXMAPS 1
+# define LL_QTWEBKIT_USES_PIXMAPS 0
#else
# define LL_QTWEBKIT_USES_PIXMAPS 0
#endif // LL_LINUX