From 91a5c602e313b96ffaf1d50b7f0d2923a2e141ba Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 30 Sep 2012 07:48:03 -0700
Subject: Revert "Added request.Proxy=null everywhere, as discussed in
 http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow."
 But the patch is here, in case anyone wants to try it.

This reverts commit 531edd51d82ecd6a842a2611c99e9919634491ef.
---
 OpenSim/Region/CoreModules/World/Archiver/ArchiveHelpers.cs | 1 -
 OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs   | 1 -
 OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 1 -
 3 files changed, 3 deletions(-)

(limited to 'OpenSim/Region/CoreModules/World')

diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveHelpers.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveHelpers.cs
index ff8f119..c72acc3 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveHelpers.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveHelpers.cs
@@ -110,7 +110,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             request.ContentLength = 0;
             request.KeepAlive     = false;
-            request.Proxy = null;
 
             WebResponse response = request.GetResponse();
             Stream file = response.GetResponseStream();
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index c70031f..4694b14 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -352,7 +352,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
             request.ContentLength = 0;
             request.KeepAlive = false;
-            request.Proxy = null;
 
             WebResponse response = request.GetResponse();
             Stream file = response.GetResponseStream();
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 0fdc5a8..dfba3ff 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -819,7 +819,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
             mapitemsrequest.Method = "POST";
             mapitemsrequest.ContentType = "application/xml+llsd";
-            mapitemsrequest.Proxy = null;
             OSDMap RAMap = new OSDMap();
 
             // string RAMapString = RAMap.ToString();
-- 
cgit v1.1