diff options
Merge branch 'master' into htb-throttle
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 9f14761..14e4534 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1796,6 +1796,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1796 | if (crossedBordery.BorderLine.Z > 0) | 1796 | if (crossedBordery.BorderLine.Z > 0) |
1797 | { | 1797 | { |
1798 | pos.Y = ((pos.Y + crossedBordery.BorderLine.Z)); | 1798 | pos.Y = ((pos.Y + crossedBordery.BorderLine.Z)); |
1799 | changeY = (int)(crossedBordery.BorderLine.Z / (int)Constants.RegionSize); | ||
1799 | } | 1800 | } |
1800 | else | 1801 | else |
1801 | pos.Y = ((pos.Y + Constants.RegionSize)); | 1802 | pos.Y = ((pos.Y + Constants.RegionSize)); |