diff options
| author | Sean Dague | 2009-08-31 20:16:32 -0400 |
|---|---|---|
| committer | Sean Dague | 2009-08-31 20:16:32 -0400 |
| commit | 4333bc7742b1aac3f548073cde2048ef678ffa3b (patch) | |
| tree | 84dcf03ea648ae1b3a70f99faff3b2faff7492ff /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | change regular test target to use nunit exec mode (diff) | |
| parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
| download | opensim-SC_OLD-4333bc7742b1aac3f548073cde2048ef678ffa3b.zip opensim-SC_OLD-4333bc7742b1aac3f548073cde2048ef678ffa3b.tar.gz opensim-SC_OLD-4333bc7742b1aac3f548073cde2048ef678ffa3b.tar.bz2 opensim-SC_OLD-4333bc7742b1aac3f548073cde2048ef678ffa3b.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index b8c8f32..f4a0d2e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -1710,7 +1710,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1710 | int thisx = (int)RegionInfo.RegionLocX; | 1710 | int thisx = (int)RegionInfo.RegionLocX; |
| 1711 | int thisy = (int)RegionInfo.RegionLocY; | 1711 | int thisy = (int)RegionInfo.RegionLocY; |
| 1712 | 1712 | ||
| 1713 | ulong newRegionHandle = 0; | 1713 | |
| 1714 | // use this if no borders were crossed! | ||
| 1715 | ulong newRegionHandle | ||
| 1716 | = Util.UIntsToLong((uint)((thisx) * Constants.RegionSize), | ||
| 1717 | (uint)((thisy) * Constants.RegionSize)); | ||
| 1718 | |||
| 1714 | Vector3 pos = attemptedPosition; | 1719 | Vector3 pos = attemptedPosition; |
| 1715 | 1720 | ||
| 1716 | if (TestBorderCross(attemptedPosition, Cardinals.W)) | 1721 | if (TestBorderCross(attemptedPosition, Cardinals.W)) |