diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-11-24 10:11:19 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-11-24 10:11:19 -0500 |
| commit | c6e3a16b52a900d5fdddcd7424116593e67bb16e (patch) | |
| tree | 12ca75c2fd5480b5ac744e74289b5347b581d109 | |
| parent | 3d83c6501e07a33ad04a6f049dd462089f818fb8 (diff) | |
| parent | fae00f8c794c067f7a6c72032698c9c413be041c (diff) | |
merge
| -rwxr-xr-x | indra/newview/llmeshrepository.cpp | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | install.xml | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 1ff11f2c01..2f355520ff 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/install.xml b/install.xml index e4735034a3..899007bc1b 100644..100755 --- a/install.xml +++ b/install.xml @@ -320,9 +320,9 @@ <key>windows</key> <map> <key>md5sum</key> - <string>b28856d3d02ee680353ae440561a6579</string> + <string>4918680ff8a1a5900e5464136b8c7988</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-20101122.tar.bz2</uri> </map> </map> </map> |