From 7498504c92b79809fd7bbf7aa994eedd9b417d37 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Thu, 4 Mar 2010 17:22:22 +0000 Subject: EXT-5969 build and merge a shippable pixmap-based llqtwebkit for viewer2.0/linux Maybe also: EXT-4495 flash content crashes Webkit on Linux --- indra/media_plugins/webkit/media_plugin_webkit.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'indra/media_plugins') diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp index 072b58720f..e66ac3049f 100644 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -44,7 +44,11 @@ #include "media_plugin_base.h" // set to 1 if you're using the version of llqtwebkit that's QPixmap-ified -#define LL_QTWEBKIT_USES_PIXMAPS 0 +#if LL_LINUX +# define LL_QTWEBKIT_USES_PIXMAPS 1 +#else +# define LL_QTWEBKIT_USES_PIXMAPS 0 +#endif // LL_LINUX #if LL_LINUX # include "linux_volume_catcher.h" -- cgit v1.2.3