diff options
| author | John Hurliman | 2009-10-14 16:48:42 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-10-14 16:48:42 -0700 |
| commit | fe4109a5b046e72801f3da1899a8cc7b411998d7 (patch) | |
| tree | a3f681c6d4ece12fe4335a5fb271a18ab8126401 /OpenSim/Region/Framework/Scenes | |
| parent | Allow the LLUDP server to run in either synchronous or asynchronous mode with... (diff) | |
| parent | Merge branch 'master' into htb-throttle (diff) | |
| download | opensim-SC-fe4109a5b046e72801f3da1899a8cc7b411998d7.zip opensim-SC-fe4109a5b046e72801f3da1899a8cc7b411998d7.tar.gz opensim-SC-fe4109a5b046e72801f3da1899a8cc7b411998d7.tar.bz2 opensim-SC-fe4109a5b046e72801f3da1899a8cc7b411998d7.tar.xz | |
Merge branch 'htb-throttle' of ssh://opensimulator.org/var/git/opensim into htb-throttle
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -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)); |