diff options
author | meta7 | 2010-08-18 02:53:27 -0700 |
---|---|---|
committer | meta7 | 2010-08-18 02:53:27 -0700 |
commit | ca8b1e488c167e5644567cb001c9c2a6504f15f7 (patch) | |
tree | 2a99b396dd4ccbd6c801efc0890fad1bd94b45e2 /OpenSim/Services/Connectors/Simulation | |
parent | Fix a nullref exception in the prioritizer (diff) | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.zip opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.gz opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.bz2 opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.xz |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index 0947b5f..957df35 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -257,7 +257,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
257 | HttpWebRequest ChildUpdateRequest = (HttpWebRequest)WebRequest.Create(uri); | 257 | HttpWebRequest ChildUpdateRequest = (HttpWebRequest)WebRequest.Create(uri); |
258 | ChildUpdateRequest.Method = "PUT"; | 258 | ChildUpdateRequest.Method = "PUT"; |
259 | ChildUpdateRequest.ContentType = "application/json"; | 259 | ChildUpdateRequest.ContentType = "application/json"; |
260 | ChildUpdateRequest.Timeout = 10000; | 260 | ChildUpdateRequest.Timeout = 30000; |
261 | //ChildUpdateRequest.KeepAlive = false; | 261 | //ChildUpdateRequest.KeepAlive = false; |
262 | 262 | ||
263 | // Fill it in | 263 | // Fill it in |
@@ -334,7 +334,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
334 | } | 334 | } |
335 | catch (WebException ex) | 335 | catch (WebException ex) |
336 | { | 336 | { |
337 | m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of ChilAgentUpdate {0}", ex.Message); | 337 | m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of ChilAgentUpdate from {0}: {1}", uri, ex.Message); |
338 | // ignore, really | 338 | // ignore, really |
339 | } | 339 | } |
340 | finally | 340 | finally |