diff options
| author | Justin Clark-Casey (justincc) | 2009-10-14 19:44:19 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2009-10-14 19:44:19 +0100 |
| commit | c58713a3a5a2331d1869469ecf6929c28af1c16a (patch) | |
| tree | f9f83e76caa9e9178e4377d6e0716c3b3cd04ee6 /OpenSim/Region/Framework | |
| parent | * minor: remove some mono compiler warnings (diff) | |
| parent | Setting changeY in border crossing. (diff) | |
| download | opensim-SC_OLD-c58713a3a5a2331d1869469ecf6929c28af1c16a.zip opensim-SC_OLD-c58713a3a5a2331d1869469ecf6929c28af1c16a.tar.gz opensim-SC_OLD-c58713a3a5a2331d1869469ecf6929c28af1c16a.tar.bz2 opensim-SC_OLD-c58713a3a5a2331d1869469ecf6929c28af1c16a.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
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 0f351ce..04eb93f 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -1804,6 +1804,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1804 | if (crossedBordery.BorderLine.Z > 0) | 1804 | if (crossedBordery.BorderLine.Z > 0) |
| 1805 | { | 1805 | { |
| 1806 | pos.Y = ((pos.Y + crossedBordery.BorderLine.Z)); | 1806 | pos.Y = ((pos.Y + crossedBordery.BorderLine.Z)); |
| 1807 | changeY = (int)(crossedBordery.BorderLine.Z / (int)Constants.RegionSize); | ||
| 1807 | } | 1808 | } |
| 1808 | else | 1809 | else |
| 1809 | pos.Y = ((pos.Y + Constants.RegionSize)); | 1810 | pos.Y = ((pos.Y + Constants.RegionSize)); |