From 6079a50186923cd764474e94d70da89074d0a7ab Mon Sep 17 00:00:00 2001
From: Monroe Linden <monroe@lindenlab.com>
Date: Fri, 12 Mar 2010 13:49:40 -0800
Subject: New linux build of llqtwebkit.
Also, disabled LL_QTWEBKIT_USES_PIXMAPS define in media_plugin_webkit.cpp as the QPixmap changes have been backed out of the llqtwebkit build for now.
---
indra/media_plugins/webkit/media_plugin_webkit.cpp | 2 +-
install.xml | 4 ++--
2 files changed, 3 insertions(+), 3 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
diff --git a/install.xml b/install.xml
index 919468b446..2a6083a5c0 100644
--- a/install.xml
+++ b/install.xml
@@ -955,9 +955,9 @@ anguage Infrstructure (CLI) international standard</string>
<key>linux</key>
<map>
<key>md5sum</key>
- <string>4b1913c509ea8bec78523960700d7005</string>
+ <string>ba22560ea01b03c40f3a37013b335f56</string>
<key>url</key>
- <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-20100304.tar.bz2</uri>
+ <uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-linux-20100311.tar.bz2</uri>
</map>
<key>windows</key>
<map>
--
cgit v1.2.3