summaryrefslogtreecommitdiff
path: root/indra/media_plugins/webkit
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2010-03-12 13:49:40 -0800
committerMonroe Linden <monroe@lindenlab.com>2010-03-12 13:49:40 -0800
commit6079a50186923cd764474e94d70da89074d0a7ab (patch)
tree2718e25efd54a63910036ebc29a59ad808361d80 /indra/media_plugins/webkit
parentbf767cc6484fa1618166e15c4be6636a568a21ca (diff)
New linux build of llqtwebkit.
Also, disabled LL_QTWEBKIT_USES_PIXMAPS define in media_plugin_webkit.cpp as the QPixmap changes have been backed out of the llqtwebkit build for now.
Diffstat (limited to 'indra/media_plugins/webkit')
-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