diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 4c7850f..cc74f26 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)) | ||
1067 | { | ||
1068 | m_log.Debug("[REGION]: Enabling Logins"); | ||
1069 | loginsdisabled = false; | ||
1070 | } | ||
1065 | } | 1071 | } |
1066 | catch (NotImplementedException) | 1072 | catch (NotImplementedException) |
1067 | { | 1073 | { |
@@ -1110,13 +1116,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
1110 | 1116 | ||
1111 | public void AddGroupTarget(SceneObjectGroup grp) | 1117 | public void AddGroupTarget(SceneObjectGroup grp) |
1112 | { | 1118 | { |
1113 | lock(m_groupsWithTargets) | 1119 | lock (m_groupsWithTargets) |
1114 | m_groupsWithTargets[grp.UUID] = grp; | 1120 | m_groupsWithTargets[grp.UUID] = grp; |
1115 | } | 1121 | } |
1116 | 1122 | ||
1117 | public void RemoveGroupTarget(SceneObjectGroup grp) | 1123 | public void RemoveGroupTarget(SceneObjectGroup grp) |
1118 | { | 1124 | { |
1119 | lock(m_groupsWithTargets) | 1125 | lock (m_groupsWithTargets) |
1120 | m_groupsWithTargets.Remove(grp.UUID); | 1126 | m_groupsWithTargets.Remove(grp.UUID); |
1121 | } | 1127 | } |
1122 | 1128 | ||
@@ -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})", |