diff options
author | Melanie | 2010-01-10 04:16:06 +0000 |
---|---|---|
committer | Melanie | 2010-01-10 04:16:06 +0000 |
commit | 1676e70dfe322381495b08ac1187ae9685f94e69 (patch) | |
tree | b0b949af491811972dd866bff09f037e335c2b2b /OpenSim/Region/Framework/Scenes | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Fix a small bug in login disable code (diff) | |
download | opensim-SC_OLD-1676e70dfe322381495b08ac1187ae9685f94e69.zip opensim-SC_OLD-1676e70dfe322381495b08ac1187ae9685f94e69.tar.gz opensim-SC_OLD-1676e70dfe322381495b08ac1187ae9685f94e69.tar.bz2 opensim-SC_OLD-1676e70dfe322381495b08ac1187ae9685f94e69.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 14 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 7 |
2 files changed, 9 insertions, 12 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 62d4aee..8ac4bc4 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -144,7 +144,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
144 | public CommunicationsManager CommsManager; | 144 | public CommunicationsManager CommsManager; |
145 | 145 | ||
146 | protected SceneCommunicationService m_sceneGridService; | 146 | protected SceneCommunicationService m_sceneGridService; |
147 | public bool loginsdisabled = true; | 147 | public bool LoginsDisabled = true; |
148 | 148 | ||
149 | public new float TimeDilation | 149 | public new float TimeDilation |
150 | { | 150 | { |
@@ -1289,15 +1289,19 @@ namespace OpenSim.Region.Framework.Scenes | |||
1289 | StatsReporter.addScriptLines(m_sceneGraph.GetScriptLPS()); | 1289 | StatsReporter.addScriptLines(m_sceneGraph.GetScriptLPS()); |
1290 | } | 1290 | } |
1291 | 1291 | ||
1292 | if (loginsdisabled && m_frame > 20) | 1292 | if (LoginsDisabled && m_frame == 20) |
1293 | { | 1293 | { |
1294 | // In 99.9% of cases it is a bad idea to manually force garbage collection. However, | 1294 | // In 99.9% of cases it is a bad idea to manually force garbage collection. However, |
1295 | // this is a rare case where we know we have just went through a long cycle of heap | 1295 | // this is a rare case where we know we have just went through a long cycle of heap |
1296 | // allocations, and there is no more work to be done until someone logs in | 1296 | // allocations, and there is no more work to be done until someone logs in |
1297 | GC.Collect(); | 1297 | GC.Collect(); |
1298 | 1298 | ||
1299 | m_log.DebugFormat("[REGION]: Enabling logins for {0}", RegionInfo.RegionName); | 1299 | IConfig startupConfig = m_config.Configs["Startup"]; |
1300 | loginsdisabled = false; | 1300 | if (startupConfig == null || !startupConfig.GetBoolean("StartDisabled", false)) |
1301 | { | ||
1302 | m_log.DebugFormat("[REGION]: Enabling logins for {0}", RegionInfo.RegionName); | ||
1303 | LoginsDisabled = false; | ||
1304 | } | ||
1301 | } | 1305 | } |
1302 | } | 1306 | } |
1303 | catch (NotImplementedException) | 1307 | catch (NotImplementedException) |
@@ -3375,7 +3379,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3375 | // TeleportFlags.ViaLandmark | TeleportFlags.ViaLocation | TeleportFlags.ViaLandmark | TeleportFlags.Default - Regular Teleport | 3379 | // TeleportFlags.ViaLandmark | TeleportFlags.ViaLocation | TeleportFlags.ViaLandmark | TeleportFlags.Default - Regular Teleport |
3376 | 3380 | ||
3377 | 3381 | ||
3378 | if (loginsdisabled) | 3382 | if (LoginsDisabled) |
3379 | { | 3383 | { |
3380 | reason = "Logins Disabled"; | 3384 | reason = "Logins Disabled"; |
3381 | return false; | 3385 | return false; |
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index 8c808ab..6a3c386 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
@@ -65,13 +65,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
65 | 65 | ||
66 | protected List<UUID> m_agentsInTransit; | 66 | protected List<UUID> m_agentsInTransit; |
67 | 67 | ||
68 | public bool RegionLoginsEnabled | ||
69 | { | ||
70 | get { return m_regionLoginsEnabled; } | ||
71 | set { m_regionLoginsEnabled = value; } | ||
72 | } | ||
73 | private bool m_regionLoginsEnabled = false; | ||
74 | |||
75 | /// <summary> | 68 | /// <summary> |
76 | /// An agent is crossing into this region | 69 | /// An agent is crossing into this region |
77 | /// </summary> | 70 | /// </summary> |