From fae00f8c794c067f7a6c72032698c9c413be041c Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 24 Nov 2010 09:03:14 -0500
Subject: SH-564 WIP - scrubbing not needed if curl uses thread-safe c-ares lib

---
 indra/newview/llmeshrepository.cpp | 3 ++-
 install.xml                        | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 install.xml

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
old mode 100644
new mode 100755
index e4735034a3..899007bc1b
--- 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>
-- 
cgit v1.2.3