bad merge?

2 files changed, 40 insertions, 2 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index adf3a91..50238a5 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -269,7 +269,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             return true;
         }
 
+<<<<<<< HEAD
         public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string theirversion, List<UUID> features, out string version, out string reason)
+=======
+        public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string theirversion, out string version, out string reason)
+>>>>>>> avn/ubitvar
         {
             reason = "Communications failure";
             version = ServiceVersion;
@@ -298,7 +302,29 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
                 
                 }
 
+<<<<<<< HEAD
                 return m_scenes[destination.RegionID].QueryAccess(agentID, agentHomeURI, viaTeleport, position, features, out reason);
+=======
+
+                // not really need on a grid running var regions sims
+
+                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)
+                {
+                    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, position, out reason);
+>>>>>>> avn/ubitvar
             }
 
             //m_log.Debug("[LOCAL COMMS]: region not found for QueryAccess");
@@ -335,7 +361,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
                 m_scenes[destination.RegionID].CloseAgent(id, false, auth_token);
                 return true;
             }
-
             //m_log.Debug("[LOCAL COMMS]: region not found in SendCloseAgent");
             return false;
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index dca3dd7..7044d92 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -206,7 +206,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             return m_remoteConnector.UpdateAgent(destination, cAgentData);
         }
 
+<<<<<<< HEAD
         public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string sversion, List<UUID> features, out string version, out string reason)
+=======
+        public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string sversion, out string version, out string reason)
+>>>>>>> avn/ubitvar
         {
             reason = "Communications failure";
             version = "Unknown";
@@ -215,12 +219,22 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
                 return false;
 
             // Try local first
+<<<<<<< HEAD
             if (m_localBackend.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, sversion, features, out version, out reason))
+=======
+            if (m_localBackend.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, sversion, out version, out reason))
+                return true;
+>>>>>>> avn/ubitvar
                 return true;
 
             // else do the remote thing
             if (!m_localBackend.IsLocalRegion(destination.RegionID))
+<<<<<<< HEAD
                 return m_remoteConnector.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, sversion, features, out version, out reason);
+=======
+                return m_remoteConnector.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, sversion, out version, out reason);
+
+>>>>>>> avn/ubitvar
 
             return false;
         }
@@ -238,7 +252,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             return false;
         }
 
-
         public bool CloseAgent(GridRegion destination, UUID id, string auth_token)
         {
             if (destination == null)