aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2010-08-16 08:51:56 -0700
committerDiva Canto2010-08-16 08:51:56 -0700
commitf219e320bc3eedec860bcd1137bf705f4af12865 (patch)
treecdabaf58d5fe02ff07bd44549e07a54b903eaa97 /OpenSim
parentBetter comment (related to previous commit) (diff)
downloadopensim-SC-f219e320bc3eedec860bcd1137bf705f4af12865.zip
opensim-SC-f219e320bc3eedec860bcd1137bf705f4af12865.tar.gz
opensim-SC-f219e320bc3eedec860bcd1137bf705f4af12865.tar.bz2
opensim-SC-f219e320bc3eedec860bcd1137bf705f4af12865.tar.xz
Increased the timeout on AgentUpdate to 30 sec and improved error message to try to catch some weirdnesses going on in HG TPs (and maybe non-HG TPs too).
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index 32f02fb..6244565 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