aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-07-19 00:09:22 +0100
committerJustin Clark-Casey (justincc)2012-07-19 00:09:22 +0100
commit6dda7c65ae1d58cac3e8dc2d9d64f56c870df39e (patch)
tree54b7ca4265df0cb65261e0dc0fb63ddd4d000513 /OpenSim/Region/Framework/Scenes/Scene.cs
parentAdd back notification to neighbouring regions when RegionReadyModule is not a... (diff)
downloadopensim-SC_OLD-6dda7c65ae1d58cac3e8dc2d9d64f56c870df39e.zip
opensim-SC_OLD-6dda7c65ae1d58cac3e8dc2d9d64f56c870df39e.tar.gz
opensim-SC_OLD-6dda7c65ae1d58cac3e8dc2d9d64f56c870df39e.tar.bz2
opensim-SC_OLD-6dda7c65ae1d58cac3e8dc2d9d64f56c870df39e.tar.xz
Add EventManager.OnRegionLoginsStatusChange fired whenever logins are enabled or disabled at any point, not just during initial startup.
This replaces EventManager.OnLoginsEnabled which only fired when logins were first enabled and was affected by a bug where it would never fire if the region started with logins disabled.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index d4ccd41..6d8ee7b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -128,9 +128,10 @@ namespace OpenSim.Region.Framework.Scenes
128 // root agents when ACL denies access to root agent 128 // root agents when ACL denies access to root agent
129 public bool m_strictAccessControl = true; 129 public bool m_strictAccessControl = true;
130 public int MaxUndoCount = 5; 130 public int MaxUndoCount = 5;
131
131 // Using this for RegionReady module to prevent LoginsDisabled from changing under our feet; 132 // Using this for RegionReady module to prevent LoginsDisabled from changing under our feet;
132 public bool LoginLock = false; 133 public bool LoginLock = false;
133 public bool LoginsDisabled = true; 134
134 public bool StartDisabled = false; 135 public bool StartDisabled = false;
135 public bool LoadingPrims; 136 public bool LoadingPrims;
136 public IXfer XferManager; 137 public IXfer XferManager;
@@ -1478,7 +1479,7 @@ namespace OpenSim.Region.Framework.Scenes
1478 // landMS = Util.EnvironmentTickCountSubtract(ldMS); 1479 // landMS = Util.EnvironmentTickCountSubtract(ldMS);
1479 //} 1480 //}
1480 1481
1481 if (LoginsDisabled && Frame == 20) 1482 if (!LoginsEnabled && Frame == 20)
1482 { 1483 {
1483 // m_log.DebugFormat("{0} {1} {2}", LoginsDisabled, m_sceneGraph.GetActiveScriptsCount(), LoginLock); 1484 // m_log.DebugFormat("{0} {1} {2}", LoginsDisabled, m_sceneGraph.GetActiveScriptsCount(), LoginLock);
1484 1485
@@ -1492,8 +1493,7 @@ namespace OpenSim.Region.Framework.Scenes
1492 if (!StartDisabled) 1493 if (!StartDisabled)
1493 { 1494 {
1494 m_log.InfoFormat("[REGION]: Enabling logins for {0}", RegionInfo.RegionName); 1495 m_log.InfoFormat("[REGION]: Enabling logins for {0}", RegionInfo.RegionName);
1495 LoginsDisabled = false; 1496 LoginsEnabled = true;
1496 EventManager.TriggerLoginsEnabled(this);
1497 } 1497 }
1498 1498
1499 m_sceneGridService.InformNeighborsThatRegionisUp( 1499 m_sceneGridService.InformNeighborsThatRegionisUp(
@@ -3460,7 +3460,7 @@ namespace OpenSim.Region.Framework.Scenes
3460 agent.startpos 3460 agent.startpos
3461 ); 3461 );
3462 3462
3463 if (LoginsDisabled) 3463 if (!LoginsEnabled)
3464 { 3464 {
3465 reason = "Logins Disabled"; 3465 reason = "Logins Disabled";
3466 return false; 3466 return false;