aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-09-19 17:41:21 +0000
committerJustin Clarke Casey2008-09-19 17:41:21 +0000
commit5fb7b485b211bbf19f4531a051b78dde92da4ba3 (patch)
tree655778d09beb953613b1db282dcf4cc640d90697 /OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
parentGuard LLRezObject against NaN (diff)
downloadopensim-SC-5fb7b485b211bbf19f4531a051b78dde92da4ba3.zip
opensim-SC-5fb7b485b211bbf19f4531a051b78dde92da4ba3.tar.gz
opensim-SC-5fb7b485b211bbf19f4531a051b78dde92da4ba3.tar.bz2
opensim-SC-5fb7b485b211bbf19f4531a051b78dde92da4ba3.tar.xz
* Only allow logins on standalone when the sim has completed it's initial startup (script startup doesn't count here)
* There was a small window where region logins were allowed before modules were loaded - avatars logins that hit this window could have caused bad things to happen. * A similar change will follow for grid mode sometime soon
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index 1926e79..d76f076 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -34,8 +34,10 @@ namespace OpenSim.Region.Communications.OGS1
34{ 34{
35 public class CommunicationsOGS1 : CommunicationsManager 35 public class CommunicationsOGS1 : CommunicationsManager
36 { 36 {
37 public CommunicationsOGS1(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache) 37 public CommunicationsOGS1(
38 : base(serversInfo, httpServer, assetCache, false) 38 NetworkServersInfo serversInfo, BaseHttpServer httpServer,
39 AssetCache assetCache, LibraryRootFolder libraryRootFolder)
40 : base(serversInfo, httpServer, assetCache, false, libraryRootFolder)
39 { 41 {
40 OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo, httpServer); 42 OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo, httpServer);
41 m_gridService = gridInterComms; 43 m_gridService = gridInterComms;