diff options
| author | UbitUmarov | 2015-11-29 18:28:14 +0000 |
|---|---|---|
| committer | UbitUmarov | 2015-11-29 18:28:14 +0000 |
| commit | d952b267e9e4628bc80119244e9d77dae5a50d4b (patch) | |
| tree | 06fdf20ce59cef9e1286216e60364a54d5f72534 | |
| parent | fix llLookAt in non-physical case (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-d952b267e9e4628bc80119244e9d77dae5a50d4b.zip opensim-SC-d952b267e9e4628bc80119244e9d77dae5a50d4b.tar.gz opensim-SC-d952b267e9e4628bc80119244e9d77dae5a50d4b.tar.bz2 opensim-SC-d952b267e9e4628bc80119244e9d77dae5a50d4b.tar.xz | |
Merge branch 'master' of opensimulator.org:/var/git/opensim
| -rw-r--r-- | OpenSim/Framework/WebUtil.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs index 3436984..13aa0c2 100644 --- a/OpenSim/Framework/WebUtil.cs +++ b/OpenSim/Framework/WebUtil.cs | |||
| @@ -244,6 +244,7 @@ namespace OpenSim.Framework | |||
| 244 | request.Method = method; | 244 | request.Method = method; |
| 245 | request.Timeout = timeout; | 245 | request.Timeout = timeout; |
| 246 | request.KeepAlive = false; | 246 | request.KeepAlive = false; |
| 247 | request.Proxy = null; | ||
| 247 | request.MaximumAutomaticRedirections = 10; | 248 | request.MaximumAutomaticRedirections = 10; |
| 248 | request.ReadWriteTimeout = timeout / 4; | 249 | request.ReadWriteTimeout = timeout / 4; |
| 249 | request.Headers[OSHeaderRequestID] = reqnum.ToString(); | 250 | request.Headers[OSHeaderRequestID] = reqnum.ToString(); |
| @@ -449,6 +450,7 @@ namespace OpenSim.Framework | |||
| 449 | request.Method = "POST"; | 450 | request.Method = "POST"; |
| 450 | request.Timeout = timeout; | 451 | request.Timeout = timeout; |
| 451 | request.KeepAlive = false; | 452 | request.KeepAlive = false; |
| 453 | request.Proxy = null; | ||
| 452 | request.MaximumAutomaticRedirections = 10; | 454 | request.MaximumAutomaticRedirections = 10; |
| 453 | request.ReadWriteTimeout = timeout / 4; | 455 | request.ReadWriteTimeout = timeout / 4; |
| 454 | request.Headers[OSHeaderRequestID] = reqnum.ToString(); | 456 | request.Headers[OSHeaderRequestID] = reqnum.ToString(); |