aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-16 13:29:12 -0700
committerJohn Hurliman2009-10-16 13:29:12 -0700
commitb8130586357ec2d443dc9021773540dd357c4739 (patch)
tree1b1e2aff7263b415382ce88e405751f3e62534d1
parent* Changing the "clean dropped attachments" MySQL command to a using statement... (diff)
parent* fix previous commit (diff)
downloadopensim-SC_OLD-b8130586357ec2d443dc9021773540dd357c4739.zip
opensim-SC_OLD-b8130586357ec2d443dc9021773540dd357c4739.tar.gz
opensim-SC_OLD-b8130586357ec2d443dc9021773540dd357c4739.tar.bz2
opensim-SC_OLD-b8130586357ec2d443dc9021773540dd357c4739.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs11
1 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0d8c241..49c1ebf 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -134,6 +134,7 @@ namespace OpenSim.Region.Framework.Scenes
134 public CommunicationsManager CommsManager; 134 public CommunicationsManager CommsManager;
135 135
136 protected SceneCommunicationService m_sceneGridService; 136 protected SceneCommunicationService m_sceneGridService;
137 public bool loginsdisabled = true;
137 138
138 public SceneCommunicationService SceneGridService 139 public SceneCommunicationService SceneGridService
139 { 140 {
@@ -1088,6 +1089,11 @@ namespace OpenSim.Region.Framework.Scenes
1088 StatsReporter.SetActiveScripts(m_sceneGraph.GetActiveScriptsCount()); 1089 StatsReporter.SetActiveScripts(m_sceneGraph.GetActiveScriptsCount());
1089 StatsReporter.addScriptLines(m_sceneGraph.GetScriptLPS()); 1090 StatsReporter.addScriptLines(m_sceneGraph.GetScriptLPS());
1090 } 1091 }
1092 if (loginsdisabled && (m_frame > 20))
1093 {
1094 m_log.Debug("[REGION]: Enabling Logins");
1095 loginsdisabled = false;
1096 }
1091 } 1097 }
1092 catch (NotImplementedException) 1098 catch (NotImplementedException)
1093 { 1099 {
@@ -3240,6 +3246,11 @@ namespace OpenSim.Region.Framework.Scenes
3240 /// also return a reason.</returns> 3246 /// also return a reason.</returns>
3241 public bool NewUserConnection(AgentCircuitData agent, out string reason) 3247 public bool NewUserConnection(AgentCircuitData agent, out string reason)
3242 { 3248 {
3249 if (loginsdisabled)
3250 {
3251 reason = "Logins Disabled";
3252 return false;
3253 }
3243 // Don't disable this log message - it's too helpful 3254 // Don't disable this log message - it's too helpful
3244 m_log.InfoFormat( 3255 m_log.InfoFormat(
3245 "[CONNECTION BEGIN]: Region {0} told of incoming {1} agent {2} {3} {4} (circuit code {5})", 3256 "[CONNECTION BEGIN]: Region {0} told of incoming {1} agent {2} {3} {4} (circuit code {5})",