merge

1 files changed, 2 insertions, 1 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;
 }