diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | 6 | ||||
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs index 2b00b4d..6bfc5cc 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | |||
@@ -184,7 +184,6 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
184 | { | 184 | { |
185 | HttpWebRequest request = UntrustedHttpWebRequest.Create(url); | 185 | HttpWebRequest request = UntrustedHttpWebRequest.Create(url); |
186 | request.Method = "HEAD"; | 186 | request.Method = "HEAD"; |
187 | request.Proxy = null; | ||
188 | 187 | ||
189 | using (WebResponse response = request.GetResponse()) | 188 | using (WebResponse response = request.GetResponse()) |
190 | { | 189 | { |
@@ -340,8 +339,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
340 | // Simian does not require the asset ID to be in the URL because it's in the post data. | 339 | // Simian does not require the asset ID to be in the URL because it's in the post data. |
341 | // By appending it to the URL also, we allow caching proxies (squid) to invalidate asset URLs | 340 | // By appending it to the URL also, we allow caching proxies (squid) to invalidate asset URLs |
342 | HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl + asset.FullID.ToString()); | 341 | HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl + asset.FullID.ToString()); |
343 | request.Proxy = null; | 342 | |
344 | |||
345 | HttpWebResponse response = MultipartForm.Post(request, postParameters); | 343 | HttpWebResponse response = MultipartForm.Post(request, postParameters); |
346 | using (Stream responseStream = response.GetResponseStream()) | 344 | using (Stream responseStream = response.GetResponseStream()) |
347 | { | 345 | { |
@@ -429,7 +427,6 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
429 | { | 427 | { |
430 | HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(url); | 428 | HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(url); |
431 | request.Method = "DELETE"; | 429 | request.Method = "DELETE"; |
432 | request.Proxy = null; | ||
433 | 430 | ||
434 | using (HttpWebResponse response = (HttpWebResponse)request.GetResponse()) | 431 | using (HttpWebResponse response = (HttpWebResponse)request.GetResponse()) |
435 | { | 432 | { |
@@ -463,7 +460,6 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
463 | try | 460 | try |
464 | { | 461 | { |
465 | HttpWebRequest request = UntrustedHttpWebRequest.Create(url); | 462 | HttpWebRequest request = UntrustedHttpWebRequest.Create(url); |
466 | request.Proxy = null; | ||
467 | 463 | ||
468 | using (WebResponse response = request.GetResponse()) | 464 | using (WebResponse response = request.GetResponse()) |
469 | { | 465 | { |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs index 730d1da..93fdae3 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs | |||
@@ -212,7 +212,6 @@ namespace OpenSim.Region.OptionalModules.Simian | |||
212 | HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl); | 212 | HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl); |
213 | request.Timeout = 20000; | 213 | request.Timeout = 20000; |
214 | request.ReadWriteTimeout = 5000; | 214 | request.ReadWriteTimeout = 5000; |
215 | request.Proxy = null; | ||
216 | 215 | ||
217 | using (HttpWebResponse response = MultipartForm.Post(request, postParameters)) | 216 | using (HttpWebResponse response = MultipartForm.Post(request, postParameters)) |
218 | { | 217 | { |