summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-03-04 17:22:22 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-03-04 17:22:22 +0000
commit7498504c92b79809fd7bbf7aa994eedd9b417d37 (patch)
tree7d03e0e3c6714314381e4c233be00221e0e95b6d
parent496e6e1948423e336088018f2d4d4c6faf942171 (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
-rw-r--r--indra/media_plugins/webkit/media_plugin_webkit.cpp6
-rw-r--r--install.xml4
2 files changed, 7 insertions, 3 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"
diff --git a/install.xml b/install.xml
index 17091d65a6..3cd40d8893 100644
--- a/install.xml
+++ b/install.xml
@@ -974,9 +974,9 @@ anguage Infrstructure (CLI) international standard</string>
<key>linux</key>
<map>
<key>md5sum</key>
- <string>4c75b2f1e8524c7844ee3ea1cd59a3db</string>
+ <string>4b1913c509ea8bec78523960700d7005</string>
<key>url</key>
- <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-20100209b.tar.bz2</uri>
+ <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-20100304.tar.bz2</uri>
</map>
<key>windows</key>
<map>