diff options
author | UbitUmarov | 2015-10-31 21:58:40 +0000 |
---|---|---|
committer | UbitUmarov | 2015-10-31 21:58:40 +0000 |
commit | af4ca8e80e99cd8aa518a1fad2a00246a7841f70 (patch) | |
tree | 806d5007f1b1e380bb10e259c5797cdedc019d87 | |
parent | fix transfer protocol version in string format. Let that case have tests iden... (diff) | |
download | opensim-SC_OLD-af4ca8e80e99cd8aa518a1fad2a00246a7841f70.zip opensim-SC_OLD-af4ca8e80e99cd8aa518a1fad2a00246a7841f70.tar.gz opensim-SC_OLD-af4ca8e80e99cd8aa518a1fad2a00246a7841f70.tar.bz2 opensim-SC_OLD-af4ca8e80e99cd8aa518a1fad2a00246a7841f70.tar.xz |
fix internal support for non square regions
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs index 3b3350b..cc8203e 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | |||
@@ -255,11 +255,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
255 | // m_log.DebugFormat( | 255 | // m_log.DebugFormat( |
256 | // "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate", | 256 | // "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate", |
257 | // s.RegionInfo.RegionName, destination.RegionHandle); | 257 | // s.RegionInfo.RegionName, destination.RegionHandle); |
258 | uint size = m_scenes[destination.RegionID].RegionInfo.RegionSizeX; | 258 | uint sizeX = m_scenes[destination.RegionID].RegionInfo.RegionSizeX; |
259 | uint sizeY = m_scenes[destination.RegionID].RegionInfo.RegionSizeY; | ||
259 | 260 | ||
260 | // Var regions here, and the requesting simulator is in an older version. | 261 | // Var regions here, and the requesting simulator is in an older version. |
261 | // We will forbide this, because it crashes the viewers | 262 | // We will forbide this, because it crashes the viewers |
262 | if (ctx.OutboundVersion < 0.3f && size != 256) | 263 | if (ctx.OutboundVersion < 0.3f && (sizeX != 256 || sizeY != 256)) |
263 | { | 264 | { |
264 | reason = "Destination is a variable-sized region, and source is an old simulator. Consider upgrading."; | 265 | reason = "Destination is a variable-sized region, and source is an old simulator. Consider upgrading."; |
265 | m_log.DebugFormat("[LOCAL SIMULATION CONNECTOR]: Request to access this variable-sized region from older simulator was denied"); | 266 | m_log.DebugFormat("[LOCAL SIMULATION CONNECTOR]: Request to access this variable-sized region from older simulator was denied"); |