diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-03-13 22:52:53 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-03-13 22:52:53 -0600 |
| commit | 663147647d270eff17e654cd13be62b18cc6db30 (patch) | |
| tree | a8ed70b81266927a218df8bd9091881681a37699 /indra/media_plugins/webkit | |
| parent | 71d11af31083ced30da7b67a2a63e624c93b44a3 (diff) | |
| parent | 234cd6e7c04c0840be6ae4a74eaf138e72876f44 (diff) | |
merge with viewer-2-0
Diffstat (limited to 'indra/media_plugins/webkit')
| -rw-r--r-- | indra/media_plugins/webkit/media_plugin_webkit.cpp | 2 |
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 |