diff options
author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | |
parent | bad merge? (diff) | |
download | opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz |
seems to compile ( tests comented out)
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs index 50238a5..9d4c282 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | |||
@@ -269,11 +269,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
269 | return true; | 269 | return true; |
270 | } | 270 | } |
271 | 271 | ||
272 | <<<<<<< HEAD | 272 | |
273 | public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string theirversion, List<UUID> features, out string version, out string reason) | 273 | public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string theirversion, List<UUID> features, out string version, out string reason) |
274 | ======= | ||
275 | public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string theirversion, out string version, out string reason) | ||
276 | >>>>>>> avn/ubitvar | ||
277 | { | 274 | { |
278 | reason = "Communications failure"; | 275 | reason = "Communications failure"; |
279 | version = ServiceVersion; | 276 | version = ServiceVersion; |
@@ -302,29 +299,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
302 | 299 | ||
303 | } | 300 | } |
304 | 301 | ||
305 | <<<<<<< HEAD | ||
306 | return m_scenes[destination.RegionID].QueryAccess(agentID, agentHomeURI, viaTeleport, position, features, out reason); | ||
307 | ======= | ||
308 | |||
309 | // not really need on a grid running var regions sims | ||
310 | |||
311 | uint size = m_scenes[destination.RegionID].RegionInfo.RegionSizeX; | ||
312 | |||
313 | float theirVersionNumber = 0f; | ||
314 | string[] versionComponents = theirversion.Split(new char[] { '/' }); | ||
315 | if (versionComponents.Length >= 2) | ||
316 | float.TryParse(versionComponents[1], out theirVersionNumber); | ||
317 | 302 | ||
318 | // Var regions here, and the requesting simulator is in an older version. | 303 | return m_scenes[destination.RegionID].QueryAccess(agentID, agentHomeURI, viaTeleport, position, features, out reason); |
319 | // We will forbide this, because it crashes the viewers | ||
320 | if (theirVersionNumber < 0.3f && size > 256) | ||
321 | { | ||
322 | reason = "Destination is a variable-sized region, and source is an old simulator. Consider upgrading."; | ||
323 | m_log.DebugFormat("[LOCAL SIMULATION CONNECTOR]: Request to access this variable-sized region from {0} simulator was denied", theirVersionNumber); | ||
324 | return false; | ||
325 | } | ||
326 | return m_scenes[destination.RegionID].QueryAccess(agentID, position, out reason); | ||
327 | >>>>>>> avn/ubitvar | ||
328 | } | 304 | } |
329 | 305 | ||
330 | //m_log.Debug("[LOCAL COMMS]: region not found for QueryAccess"); | 306 | //m_log.Debug("[LOCAL COMMS]: region not found for QueryAccess"); |