diff options
| author | Armin Weatherwax | 2010-06-14 17:51:51 +0200 |
|---|---|---|
| committer | Armin Weatherwax | 2010-09-23 15:42:38 +0200 |
| commit | 093b99196f27b518b183953cade1077fa6d7c5ed (patch) | |
| tree | 154ce4bfa2fbdeae561aa4b115568e4ec2680861 /linden/indra/media_plugins | |
| parent | update to latest SG2 media_plugins (diff) | |
| download | meta-impy-093b99196f27b518b183953cade1077fa6d7c5ed.zip meta-impy-093b99196f27b518b183953cade1077fa6d7c5ed.tar.gz meta-impy-093b99196f27b518b183953cade1077fa6d7c5ed.tar.bz2 meta-impy-093b99196f27b518b183953cade1077fa6d7c5ed.tar.xz | |
update llplugin to latest version of SG2, pull latest webkit
Diffstat (limited to 'linden/indra/media_plugins')
| -rwxr-xr-x | linden/indra/media_plugins/webkit/media_plugin_webkit.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp b/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp index 28c6e98..09ba8dc 100755 --- a/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp | |||
| @@ -47,6 +47,7 @@ | |||
| 47 | 47 | ||
| 48 | // set to 1 if you're using the version of llqtwebkit that's QPixmap-ified | 48 | // set to 1 if you're using the version of llqtwebkit that's QPixmap-ified |
| 49 | #if LL_LINUX | 49 | #if LL_LINUX |
| 50 | # include <iomanip> | ||
| 50 | # define LL_QTWEBKIT_USES_PIXMAPS 0 | 51 | # define LL_QTWEBKIT_USES_PIXMAPS 0 |
| 51 | #else | 52 | #else |
| 52 | # define LL_QTWEBKIT_USES_PIXMAPS 0 | 53 | # define LL_QTWEBKIT_USES_PIXMAPS 0 |