diff options
| author | Dan Lake | 2011-12-20 14:46:44 -0800 |
|---|---|---|
| committer | Dan Lake | 2011-12-20 14:46:44 -0800 |
| commit | 7693e6a3a8d811a75ee3773f0c9ae0b0150dc5cd (patch) | |
| tree | 3de2f42376d23ead500098d98e6d2bbd6e21feda /OpenSim/Region/RegionCombinerModule | |
| parent | Remove unused SetAcceleration and add set on Acceleration parameter (diff) | |
| parent | Remove unused SetAcceleration and add set on Acceleration parameter (diff) | |
| download | opensim-SC-7693e6a3a8d811a75ee3773f0c9ae0b0150dc5cd.zip opensim-SC-7693e6a3a8d811a75ee3773f0c9ae0b0150dc5cd.tar.gz opensim-SC-7693e6a3a8d811a75ee3773f0c9ae0b0150dc5cd.tar.bz2 opensim-SC-7693e6a3a8d811a75ee3773f0c9ae0b0150dc5cd.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule')
| -rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs index 9b468dd..09da97a 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | |||
| @@ -415,7 +415,7 @@ namespace OpenSim.Region.RegionCombinerModule | |||
| 415 | //xxy | 415 | //xxy |
| 416 | //xxx | 416 | //xxx |
| 417 | //xxx | 417 | //xxx |
| 418 | if ((((int)conn.X * (int)Constants.RegionSize) + conn.YEnd | 418 | if ((((int)conn.X * (int)Constants.RegionSize) + conn.XEnd |
| 419 | >= (regionConnections.X * (int)Constants.RegionSize)) | 419 | >= (regionConnections.X * (int)Constants.RegionSize)) |
| 420 | && (((int)conn.Y * (int)Constants.RegionSize) + conn.YEnd | 420 | && (((int)conn.Y * (int)Constants.RegionSize) + conn.YEnd |
| 421 | >= (regionConnections.Y * (int)Constants.RegionSize))) | 421 | >= (regionConnections.Y * (int)Constants.RegionSize))) |