summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-08-27 09:26:52 -0700
committerMerov Linden <merov@lindenlab.com>2010-08-27 09:26:52 -0700
commitc9631e6112b618d191430ba79a1024555ab3f448 (patch)
tree748a423403383840ed94a7461cb2cdfce7933d04
parentdbe965eaa1864ff71e365608488a5015172a24ed (diff)
parent3c8089b0fe2833904c7580da634a6323aab39a6e (diff)
Sync with viewer-development
-rw-r--r--indra/newview/viewer_manifest.py4
-rw-r--r--install.xml4
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index e963bcc9f7..08ba8c13b1 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -930,10 +930,10 @@ class Linux_i686Manifest(LinuxManifest):
self.path("libopenal.so", "libopenal.so.1")
self.path("libopenal.so", "libvivoxoal.so.1") # vivox's sdk expects this soname
try:
- self.path("libkdu_v42R.so", "libkdu.so")
+ self.path("libkdu.so")
pass
except:
- print "Skipping libkdu_v42R.so - not found"
+ print "Skipping libkdu.so - not found"
pass
try:
self.path("libfmod-3.75.so")
diff --git a/install.xml b/install.xml
index 3a9dc5f6d1..a47a732d56 100644
--- a/install.xml
+++ b/install.xml
@@ -797,9 +797,9 @@
<key>linux</key>
<map>
<key>md5sum</key>
- <string>b379063f5f03374f85620e87ce48e497</string>
+ <string>b1f15bbabb68445e55ce23a2aeaca598</string>
<key>url</key>
- <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/indra_private-2.1.1-linux-20100820.tar.bz2</uri>
+ <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/indra_private-2.1.1-linux-20100826.tar.bz2</uri>
</map>
<key>windows</key>
<map>