diff options
author | Diva Canto | 2011-05-28 13:52:27 -0700 |
---|---|---|
committer | Diva Canto | 2011-05-28 13:52:27 -0700 |
commit | 5cb7d8bc71da1b7da001d8586dff1235113d6aa3 (patch) | |
tree | 9242955829557462f16bcc8b5144390cbd36c795 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Fixed an issue with the response of CreateAgent over the SimulationConnector. (diff) | |
parent | Comment the alert_uri so it remains disabled until set (diff) | |
download | opensim-SC-5cb7d8bc71da1b7da001d8586dff1235113d6aa3.zip opensim-SC-5cb7d8bc71da1b7da001d8586dff1235113d6aa3.tar.gz opensim-SC-5cb7d8bc71da1b7da001d8586dff1235113d6aa3.tar.bz2 opensim-SC-5cb7d8bc71da1b7da001d8586dff1235113d6aa3.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index e9f5f9e..1d562fd 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1376,9 +1376,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
1376 | IConfig startupConfig = m_config.Configs["Startup"]; | 1376 | IConfig startupConfig = m_config.Configs["Startup"]; |
1377 | if (startupConfig == null || !startupConfig.GetBoolean("StartDisabled", false)) | 1377 | if (startupConfig == null || !startupConfig.GetBoolean("StartDisabled", false)) |
1378 | { | 1378 | { |
1379 | // This handles a case of a region having no scripts for the RegionReady module | ||
1379 | if (m_sceneGraph.GetActiveScriptsCount() == 0) | 1380 | if (m_sceneGraph.GetActiveScriptsCount() == 0) |
1380 | { | 1381 | { |
1382 | // need to be able to tell these have changed in RegionReady | ||
1381 | LoginLock = false; | 1383 | LoginLock = false; |
1384 | EventManager.TriggerLoginsEnabled(RegionInfo.RegionName); | ||
1382 | } | 1385 | } |
1383 | m_log.DebugFormat("[REGION]: Enabling logins for {0}", RegionInfo.RegionName); | 1386 | m_log.DebugFormat("[REGION]: Enabling logins for {0}", RegionInfo.RegionName); |
1384 | // For RegionReady lockouts | 1387 | // For RegionReady lockouts |