aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorBlueWall2011-05-28 00:39:21 -0400
committerBlueWall2011-05-28 00:39:21 -0400
commitd2c2a4301b5c2d12e05483a1af0ea5959b7be5ca (patch)
tree0defa28e701d9ffaa0c4352c751d5273180d0742 /OpenSim/Region/Framework/Scenes
parentminor: remove mono compiler warning (diff)
parentAdd option to disable logins (diff)
downloadopensim-SC_OLD-d2c2a4301b5c2d12e05483a1af0ea5959b7be5ca.zip
opensim-SC_OLD-d2c2a4301b5c2d12e05483a1af0ea5959b7be5ca.tar.gz
opensim-SC_OLD-d2c2a4301b5c2d12e05483a1af0ea5959b7be5ca.tar.bz2
opensim-SC_OLD-d2c2a4301b5c2d12e05483a1af0ea5959b7be5ca.tar.xz
Merge branch 'master' of /home/opensim/src/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs18
1 files changed, 17 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 4aae13c..e9f5f9e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -94,7 +94,10 @@ namespace OpenSim.Region.Framework.Scenes
94 // root agents when ACL denies access to root agent 94 // root agents when ACL denies access to root agent
95 public bool m_strictAccessControl = true; 95 public bool m_strictAccessControl = true;
96 public int MaxUndoCount = 5; 96 public int MaxUndoCount = 5;
97 // Using this for RegionReady module to prevent LoginsDisabled from changing under our feet;
98 public bool LoginLock = false;
97 public bool LoginsDisabled = true; 99 public bool LoginsDisabled = true;
100 public bool StartDisabled = false;
98 public bool LoadingPrims; 101 public bool LoadingPrims;
99 public IXfer XferManager; 102 public IXfer XferManager;
100 103
@@ -1373,10 +1376,23 @@ namespace OpenSim.Region.Framework.Scenes
1373 IConfig startupConfig = m_config.Configs["Startup"]; 1376 IConfig startupConfig = m_config.Configs["Startup"];
1374 if (startupConfig == null || !startupConfig.GetBoolean("StartDisabled", false)) 1377 if (startupConfig == null || !startupConfig.GetBoolean("StartDisabled", false))
1375 { 1378 {
1379 if (m_sceneGraph.GetActiveScriptsCount() == 0)
1380 {
1381 LoginLock = false;
1382 }
1376 m_log.DebugFormat("[REGION]: Enabling logins for {0}", RegionInfo.RegionName); 1383 m_log.DebugFormat("[REGION]: Enabling logins for {0}", RegionInfo.RegionName);
1377 LoginsDisabled = false; 1384 // For RegionReady lockouts
1385 if( LoginLock == false)
1386 {
1387 LoginsDisabled = false;
1388 }
1378 m_sceneGridService.InformNeighborsThatRegionisUp(RequestModuleInterface<INeighbourService>(), RegionInfo); 1389 m_sceneGridService.InformNeighborsThatRegionisUp(RequestModuleInterface<INeighbourService>(), RegionInfo);
1379 } 1390 }
1391 else
1392 {
1393 StartDisabled = true;
1394 LoginsDisabled = true;
1395 }
1380 } 1396 }
1381 } 1397 }
1382 catch (NotImplementedException) 1398 catch (NotImplementedException)