diff options
author | Teravus Ovares (Dan Olivares) | 2009-10-16 16:22:10 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-10-16 16:22:10 -0400 |
commit | ac31cb89d59b1d9be84df94ef3f26cad8624c452 (patch) | |
tree | f9c3ae03d9219fc087cb11624691059873ddb53d | |
parent | * One more attempt at the NullRef In The OdePlugin. This might fix it, but ... (diff) | |
download | opensim-SC_OLD-ac31cb89d59b1d9be84df94ef3f26cad8624c452.zip opensim-SC_OLD-ac31cb89d59b1d9be84df94ef3f26cad8624c452.tar.gz opensim-SC_OLD-ac31cb89d59b1d9be84df94ef3f26cad8624c452.tar.bz2 opensim-SC_OLD-ac31cb89d59b1d9be84df94ef3f26cad8624c452.tar.xz |
* Ensure that at least 20 frames run before letting avatar in.
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index d3d397d..c4622cd 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -128,6 +128,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
128 | public CommunicationsManager CommsManager; | 128 | public CommunicationsManager CommsManager; |
129 | 129 | ||
130 | protected SceneCommunicationService m_sceneGridService; | 130 | protected SceneCommunicationService m_sceneGridService; |
131 | public bool loginsdisabled = true; | ||
131 | 132 | ||
132 | public SceneCommunicationService SceneGridService | 133 | public SceneCommunicationService SceneGridService |
133 | { | 134 | { |
@@ -1062,6 +1063,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
1062 | StatsReporter.SetActiveScripts(m_sceneGraph.GetActiveScriptsCount()); | 1063 | StatsReporter.SetActiveScripts(m_sceneGraph.GetActiveScriptsCount()); |
1063 | StatsReporter.addScriptLines(m_sceneGraph.GetScriptLPS()); | 1064 | StatsReporter.addScriptLines(m_sceneGraph.GetScriptLPS()); |
1064 | } | 1065 | } |
1066 | if (loginsdisabled && ((m_frame % 20) == 0)) | ||
1067 | { | ||
1068 | m_log.Debug("[REGION]: Enabling Logins"); | ||
1069 | loginsdisabled = false; | ||
1070 | } | ||
1065 | } | 1071 | } |
1066 | catch (NotImplementedException) | 1072 | catch (NotImplementedException) |
1067 | { | 1073 | { |
@@ -3227,6 +3233,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
3227 | /// also return a reason.</returns> | 3233 | /// also return a reason.</returns> |
3228 | public bool NewUserConnection(AgentCircuitData agent, out string reason) | 3234 | public bool NewUserConnection(AgentCircuitData agent, out string reason) |
3229 | { | 3235 | { |
3236 | if (loginsdisabled) | ||
3237 | { | ||
3238 | reason = "Logins Disabled"; | ||
3239 | return false; | ||
3240 | } | ||
3230 | // Don't disable this log message - it's too helpful | 3241 | // Don't disable this log message - it's too helpful |
3231 | m_log.InfoFormat( | 3242 | m_log.InfoFormat( |
3232 | "[CONNECTION BEGIN]: Region {0} told of incoming {1} agent {2} {3} {4} (circuit code {5})", | 3243 | "[CONNECTION BEGIN]: Region {0} told of incoming {1} agent {2} {3} {4} (circuit code {5})", |