diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-15 17:43:38 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-15 17:43:38 +0200 |
| commit | f41274cae3c8bfe6767ee7dceeb6e3d1563d9695 (patch) | |
| tree | 81c20219c87f23b5f9cce34099cf1db6d68709cd /indra/media_plugins/webkit/media_plugin_webkit.cpp | |
| parent | 8a8e8e46ee0564ac052c5fecaa1117db19f41c97 (diff) | |
| parent | 234cd6e7c04c0840be6ae4a74eaf138e72876f44 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/media_plugins/webkit/media_plugin_webkit.cpp')
| -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 |