diff options
| -rwxr-xr-x | indra/newview/llmeshrepository.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/viewer_manifest.py | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | install.xml | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index d8aeb1bf81..8b5eab35cb 100755 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -110,7 +110,7 @@ U32 get_volume_memory_size(const LLVolume* volume) std::string scrub_host_name(std::string http_url) { //curl loves to abuse the DNS cache, so scrub host names out of urls where trivial to prevent DNS timeouts - +#if 0 if (http_url.empty()) { return http_url; @@ -145,6 +145,7 @@ std::string scrub_host_name(std::string http_url) http_url.replace(idx, host_string.length(), ip_string); } } +#endif return http_url; } diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index e637c43674..5503cc8372 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -971,6 +971,11 @@ class Linux_i686Manifest(LinuxManifest): self.path("libvivoxplatform.so") self.end_prefix("lib") + if self.args['buildtype'].lower() == 'release' and self.is_packaging_viewer(): + print "* Going strip-crazy on the packaged binaries, since this is a RELEASE build" + self.run_command("find %(d)r/bin %(d)r/lib -type f | xargs --no-run-if-empty strip -S" % {'d': self.get_dst_prefix()} ) # makes some small assumptions about our packaged dir structure + + class Linux_x86_64Manifest(LinuxManifest): def construct(self): super(Linux_x86_64Manifest, self).construct() diff --git a/install.xml b/install.xml index e4735034a3..17d63103e0 100644..100755 --- a/install.xml +++ b/install.xml @@ -320,9 +320,9 @@ <key>windows</key> <map> <key>md5sum</key> - <string>b28856d3d02ee680353ae440561a6579</string> + <string>6a8a4fffc535badb65baedd770c74ea6</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-windows-20100611.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.21.1-windows-20101124.tar.bz2</uri> </map> </map> </map> |