diff options
| author | Justin Clarke Casey | 2008-06-13 16:32:32 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2008-06-13 16:32:32 +0000 |
| commit | 34746f5485acfae0e878344964ab37b67cdca5e1 (patch) | |
| tree | 8b15a099774e930655a8bcea212a0c569c8108b0 /OpenSim/Region | |
| parent | * minor: comment out confusing DefaultTimeout field in RestClient, which is c... (diff) | |
| download | opensim-SC-34746f5485acfae0e878344964ab37b67cdca5e1.zip opensim-SC-34746f5485acfae0e878344964ab37b67cdca5e1.tar.gz opensim-SC-34746f5485acfae0e878344964ab37b67cdca5e1.tar.bz2 opensim-SC-34746f5485acfae0e878344964ab37b67cdca5e1.tar.xz | |
* Double timeout on region registration XMLRPC call to the grid service
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 85ab99c..cbb99dc 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
| @@ -136,7 +136,10 @@ namespace OpenSim.Region.Communications.OGS1 | |||
| 136 | try | 136 | try |
| 137 | { | 137 | { |
| 138 | XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams); | 138 | XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams); |
| 139 | GridResp = GridReq.Send(serversInfo.GridURL, 30000); | 139 | |
| 140 | // The timeout should always be significantly larger than the timeout for the grid server to request | ||
| 141 | // the initial status of the region before confirming registration. | ||
| 142 | GridResp = GridReq.Send(serversInfo.GridURL, 60000); | ||
| 140 | } | 143 | } |
| 141 | catch (Exception e) | 144 | catch (Exception e) |
| 142 | { | 145 | { |