diff options
| author | Kitto Flora | 2010-08-04 21:08:14 +0000 |
|---|---|---|
| committer | Kitto Flora | 2010-08-04 21:08:14 +0000 |
| commit | 0871d20adbe1800655b8a7e9d16f71090bbf5c87 (patch) | |
| tree | 83a3e62f4aad08af9d98f7de880f2942b45c498c /OpenSim/Framework/Communications | |
| parent | Fixes fresh hollowed prim collision shape. (diff) | |
| parent | Send attachment updates only to the owner if it's a HUD (diff) | |
| download | opensim-SC-0871d20adbe1800655b8a7e9d16f71090bbf5c87.zip opensim-SC-0871d20adbe1800655b8a7e9d16f71090bbf5c87.tar.gz opensim-SC-0871d20adbe1800655b8a7e9d16f71090bbf5c87.tar.bz2 opensim-SC-0871d20adbe1800655b8a7e9d16f71090bbf5c87.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/Communications')
| -rw-r--r-- | OpenSim/Framework/Communications/RestClient.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/RestClient.cs b/OpenSim/Framework/Communications/RestClient.cs index 97b3b60..42c0b18 100644 --- a/OpenSim/Framework/Communications/RestClient.cs +++ b/OpenSim/Framework/Communications/RestClient.cs | |||
| @@ -363,7 +363,7 @@ namespace OpenSim.Framework.Communications | |||
| 363 | _request = (HttpWebRequest) WebRequest.Create(buildUri()); | 363 | _request = (HttpWebRequest) WebRequest.Create(buildUri()); |
| 364 | _request.KeepAlive = false; | 364 | _request.KeepAlive = false; |
| 365 | _request.ContentType = "application/xml"; | 365 | _request.ContentType = "application/xml"; |
| 366 | _request.Timeout = 900000; | 366 | _request.Timeout = 30000; |
| 367 | _request.Method = RequestMethod; | 367 | _request.Method = RequestMethod; |
| 368 | _asyncException = null; | 368 | _asyncException = null; |
| 369 | _request.ContentLength = src.Length; | 369 | _request.ContentLength = src.Length; |