On login and first HG entrance to a foreign grid, perform query access checks before proceeding.

2 files changed, 16 insertions, 11 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index e6de0b6..50105a6 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -283,18 +283,22 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
 //                        s.RegionInfo.RegionName, destination.RegionHandle);
                 uint size = m_scenes[destination.RegionID].RegionInfo.RegionSizeX;
 
-                float theirVersionNumber = 0f;
-                string[] versionComponents = theirversion.Split(new char[] { '/' });
-                if (versionComponents.Length >= 2)
-                    float.TryParse(versionComponents[1], out theirVersionNumber);
-
-                // Var regions here, and the requesting simulator is in an older version.
-                // We will forbide this, because it crashes the viewers
-                if (theirVersionNumber < 0.3f && size > 256)
+                if (theirversion != null)
                 {
-                    reason = "Destination is a variable-sized region, and source is an old simulator. Consider upgrading.";
-                    m_log.DebugFormat("[LOCAL SIMULATION CONNECTOR]: Request to access this variable-sized region from {0} simulator was denied", theirVersionNumber);
-                    return false;
+                    float theirVersionNumber = 0f;
+                    string[] versionComponents = theirversion.Split(new char[] { '/' });
+                    if (versionComponents.Length >= 2)
+                        float.TryParse(versionComponents[1], out theirVersionNumber);
+
+                    // Var regions here, and the requesting simulator is in an older version.
+                    // We will forbide this, because it crashes the viewers
+                    if (theirVersionNumber < 0.3f && size > 256)
+                    {
+                        reason = "Destination is a variable-sized region, and source is an old simulator. Consider upgrading.";
+                        m_log.DebugFormat("[LOCAL SIMULATION CONNECTOR]: Request to access this variable-sized region from {0} simulator was denied", theirVersionNumber);
+                        return false;
+                    
+                    }
                 }
 
                 return m_scenes[destination.RegionID].QueryAccess(agentID, agentHomeURI, viaTeleport, position, out reason);
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 27929c6..4bbe68b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -5514,6 +5514,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             int num = m_sceneGraph.GetRootAgentCount();
 
+            Console.WriteLine("{0} {1}", num, RegionInfo.RegionSettings.AgentLimit);
             if (num >= RegionInfo.RegionSettings.AgentLimit)
             {
                 if (!Permissions.IsAdministrator(agentID))