aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-07-22 18:01:54 +0100
committerJustin Clark-Casey2014-08-02 00:57:59 +0100
commitdfaabf4d0d01eddc4a6e4cd9ff9379fcf296ff03 (patch)
tree6297fb8cfc9be6190a36955981340fdc1d39fac8 /OpenSim/Region/Framework/Scenes
parentminor: convert tabs to spaces that got in on recent commit 4a9282e (diff)
downloadopensim-SC_OLD-dfaabf4d0d01eddc4a6e4cd9ff9379fcf296ff03.zip
opensim-SC_OLD-dfaabf4d0d01eddc4a6e4cd9ff9379fcf296ff03.tar.gz
opensim-SC_OLD-dfaabf4d0d01eddc4a6e4cd9ff9379fcf296ff03.tar.bz2
opensim-SC_OLD-dfaabf4d0d01eddc4a6e4cd9ff9379fcf296ff03.tar.xz
Fix recent regression in 3c6becd5 where login or hg login to variable sized regions failed with outdated simulator message.
I forgot that a null 'their version' would not be passed over the wire and ends up as an empty string instead (like older simulators). So instead pass through the correct simulator protcol version instead (SIMULATOR/0.3) when querying from login or hg login. Also removes a debug console write for agent limit accidentally left in for the same commit. Relates to mantis 7276
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs1
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 4bbe68b..27929c6 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -5514,7 +5514,6 @@ namespace OpenSim.Region.Framework.Scenes
5514 5514
5515 int num = m_sceneGraph.GetRootAgentCount(); 5515 int num = m_sceneGraph.GetRootAgentCount();
5516 5516
5517 Console.WriteLine("{0} {1}", num, RegionInfo.RegionSettings.AgentLimit);
5518 if (num >= RegionInfo.RegionSettings.AgentLimit) 5517 if (num >= RegionInfo.RegionSettings.AgentLimit)
5519 { 5518 {
5520 if (!Permissions.IsAdministrator(agentID)) 5519 if (!Permissions.IsAdministrator(agentID))