aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorRevolution2010-02-14 19:32:08 -0600
committerMelanie2010-02-15 01:07:02 +0000
commit5c7acd0d4d4d4cf1eceb27dadabc051611a9be33 (patch)
tree331d2a5f2f25cec504f43e12a7e921756205201e /OpenSim/Region/Framework/Scenes
parentPlug a small hole (diff)
downloadopensim-SC-5c7acd0d4d4d4cf1eceb27dadabc051611a9be33.zip
opensim-SC-5c7acd0d4d4d4cf1eceb27dadabc051611a9be33.tar.gz
opensim-SC-5c7acd0d4d4d4cf1eceb27dadabc051611a9be33.tar.bz2
opensim-SC-5c7acd0d4d4d4cf1eceb27dadabc051611a9be33.tar.xz
Fixes a bug in the previous patch.
Signed-off-by: Melanie <melanie@t-data.com>
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs31
1 files changed, 13 insertions, 18 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 675fb69..7cdea05 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1226,14 +1226,6 @@ namespace OpenSim.Region.Framework.Scenes
1226 } 1226 }
1227 else 1227 else
1228 { 1228 {
1229 if (m_pos.X < 0)
1230 m_pos.X = 128;
1231 if (m_pos.Y < 0)
1232 m_pos.Y = 128;
1233 if (m_pos.X > Scene.WestBorders[0].BorderLine.X)
1234 m_pos.X = 128;
1235 if (m_pos.Y > Scene.NorthBorders[0].BorderLine.Y)
1236 m_pos.Y = 128;
1237 m_LastFinitePos = m_pos; 1229 m_LastFinitePos = m_pos;
1238 } 1230 }
1239 1231
@@ -2799,16 +2791,19 @@ namespace OpenSim.Region.Framework.Scenes
2799 { 2791 {
2800 if (!needsTransit) 2792 if (!needsTransit)
2801 { 2793 {
2802 Vector3 pos = AbsolutePosition; 2794 if (m_requestedSitTargetUUID == UUID.Zero)
2803 if (AbsolutePosition.X < 0) 2795 {
2804 pos.X += Velocity.Y; 2796 Vector3 pos = AbsolutePosition;
2805 else if (AbsolutePosition.X > Constants.RegionSize) 2797 if (AbsolutePosition.X < 0)
2806 pos.X -= Velocity.Y; 2798 pos.X += Velocity.X;
2807 if (AbsolutePosition.Y < 0) 2799 else if (AbsolutePosition.X > Constants.RegionSize)
2808 pos.Y += Velocity.Y; 2800 pos.X -= Velocity.X;
2809 else if (AbsolutePosition.Y > Constants.RegionSize) 2801 if (AbsolutePosition.Y < 0)
2810 pos.Y -= Velocity.Y; 2802 pos.Y += Velocity.Y;
2811 AbsolutePosition = pos; 2803 else if (AbsolutePosition.Y > Constants.RegionSize)
2804 pos.Y -= Velocity.Y;
2805 AbsolutePosition = pos;
2806 }
2812 } 2807 }
2813 } 2808 }
2814 else if (neighbor > 0) 2809 else if (neighbor > 0)