diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-09-13 18:02:59 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-09-13 18:02:59 -0400 |
| commit | fd98ea14d2b675f7a740b25273d05b709b366e80 (patch) | |
| tree | ab5681eebf0b992ea1d8f2ff080e9f0ba74ee328 | |
| parent | 0e14bab3b08c9de8536f7804d63cbdde1e75c675 (diff) | |
| parent | d609533c207c9aee1331193257f1b44bc8a89ab4 (diff) | |
Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/
| -rw-r--r-- | indra/newview/viewer_manifest.py | 1 | ||||
| -rw-r--r-- | install.xml | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 852d11eb7e..2da5aff8d6 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -928,6 +928,7 @@ class Linux_i686Manifest(LinuxManifest): self.path("libdb-4.2.so") self.path("libcrypto.so.0.9.7") self.path("libexpat.so.1") + self.path("libglod.so") self.path("libssl.so.0.9.7") self.path("libSDL-1.2.so.0") self.path("libELFIO.so") diff --git a/install.xml b/install.xml index 030c588dfc..cd116a4ae2 100644 --- a/install.xml +++ b/install.xml @@ -63,9 +63,9 @@ <key>linux</key> <map> <key>md5sum</key> - <string>66ae292063b80f3a9fecb46dcd4fe5ec</string> + <string>cb9409ee84d5f33db14335ed5bfd7ca7</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GLOD-1.0pre4-linux-20091023.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glod-1.0pre4-linux-20100910.tar.bz2</uri> </map> <key>windows</key> <map> |