diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-04 17:22:22 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-04 17:22:22 +0000 |
| commit | 7498504c92b79809fd7bbf7aa994eedd9b417d37 (patch) | |
| tree | 7d03e0e3c6714314381e4c233be00221e0e95b6d /indra/media_plugins | |
| parent | 496e6e1948423e336088018f2d4d4c6faf942171 (diff) | |
EXT-5969 build and merge a shippable pixmap-based llqtwebkit for viewer2.0/linux
Maybe also: EXT-4495 flash content crashes Webkit on Linux
Diffstat (limited to 'indra/media_plugins')
| -rw-r--r-- | indra/media_plugins/webkit/media_plugin_webkit.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
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" |