ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/opensim/src/opensim

Browse Source
This commit is contained in:
BlueWall
2011-05-28 00:39:21 -04:00
parent 6f4a2685cf 99f42c0a6e
commit d2c2a4301b
3 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -94,7 +94,10 @@ namespace OpenSim.Region.Framework.Scenes
// root agents when ACL denies access to root agent
public bool m_strictAccessControl = true;
public int MaxUndoCount = 5;
// Using this for RegionReady module to prevent LoginsDisabled from changing under our feet;
public bool LoginLock = false;
public bool LoginsDisabled = true;
public bool StartDisabled = false;
public bool LoadingPrims;
public IXfer XferManager;
@@ -1373,10 +1376,23 @@ namespace OpenSim.Region.Framework.Scenes
IConfig startupConfig = m_config.Configs["Startup"];
if (startupConfig == null || !startupConfig.GetBoolean("StartDisabled", false))
{
if (m_sceneGraph.GetActiveScriptsCount() == 0)
{
LoginLock = false;
}
m_log.DebugFormat("[REGION]: Enabling logins for {0}", RegionInfo.RegionName);
LoginsDisabled = false;
// For RegionReady lockouts
if( LoginLock == false)
{
LoginsDisabled = false;
}
m_sceneGridService.InformNeighborsThatRegionisUp(RequestModuleInterface<INeighbourService>(), RegionInfo);
}
else
{
StartDisabled = true;
LoginsDisabled = true;
}
}
}
catch (NotImplementedException)