aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-10 12:51:31 +0000
committerMelanie Thielker2008-08-10 12:51:31 +0000
commit5acfc79c501232fff9a49464a528a7128bef918c (patch)
tree83342a1d954084b751cddf17284dac5157ef2dd8 /OpenSim
parentUpdate svn properties, minor formatting cleanup. (diff)
downloadopensim-SC_OLD-5acfc79c501232fff9a49464a528a7128bef918c.zip
opensim-SC_OLD-5acfc79c501232fff9a49464a528a7128bef918c.tar.gz
opensim-SC_OLD-5acfc79c501232fff9a49464a528a7128bef918c.tar.bz2
opensim-SC_OLD-5acfc79c501232fff9a49464a528a7128bef918c.tar.xz
Patch #9024
Bringing in an old private patch, increasing region registration timeout to 90 seconds. That allows regions witj > 10000 prims to register successfully. Running them.... well, YMMV
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index c261961..4f62d35 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -145,7 +145,7 @@ namespace OpenSim.Region.Communications.OGS1
145 145
146 // The timeout should always be significantly larger than the timeout for the grid server to request 146 // The timeout should always be significantly larger than the timeout for the grid server to request
147 // the initial status of the region before confirming registration. 147 // the initial status of the region before confirming registration.
148 GridResp = GridReq.Send(serversInfo.GridURL, 60000); 148 GridResp = GridReq.Send(serversInfo.GridURL, 90000);
149 } 149 }
150 catch (Exception e) 150 catch (Exception e)
151 { 151 {