diff options
| author | Adam Frisby | 2009-08-18 00:23:27 +1000 |
|---|---|---|
| committer | Adam Frisby | 2009-08-18 00:23:27 +1000 |
| commit | 58d9d6026eb36d530c7cec753279b7aeaa6b43eb (patch) | |
| tree | 86a09687ef01b308ac2ae8e1023ec9ddb943c54f /OpenSim/Region/Communications/OGS1 | |
| parent | * Implementing a bunch of Unimplemented MRM stubs. (diff) | |
| parent | Add System.Xml reference to the console project (diff) | |
| download | opensim-SC_OLD-58d9d6026eb36d530c7cec753279b7aeaa6b43eb.zip opensim-SC_OLD-58d9d6026eb36d530c7cec753279b7aeaa6b43eb.tar.gz opensim-SC_OLD-58d9d6026eb36d530c7cec753279b7aeaa6b43eb.tar.bz2 opensim-SC_OLD-58d9d6026eb36d530c7cec753279b7aeaa6b43eb.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Communications/OGS1')
| -rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index aef1b94..47c7fe4 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
| @@ -147,7 +147,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
| 147 | { | 147 | { |
| 148 | // The timeout should always be significantly larger than the timeout for the grid server to request | 148 | // The timeout should always be significantly larger than the timeout for the grid server to request |
| 149 | // the initial status of the region before confirming registration. | 149 | // the initial status of the region before confirming registration. |
| 150 | GridResp = GridReq.Send(serversInfo.GridURL, 90000); | 150 | GridResp = GridReq.Send(serversInfo.GridURL, 9999999); |
| 151 | } | 151 | } |
| 152 | catch (Exception e) | 152 | catch (Exception e) |
| 153 | { | 153 | { |