diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 66341a1..2323335 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -4838,9 +4838,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
4838 | 4838 | ||
4839 | public Vector3? GetNearestAllowedPosition(ScenePresence avatar) | 4839 | public Vector3? GetNearestAllowedPosition(ScenePresence avatar) |
4840 | { | 4840 | { |
4841 | //simulate to make sure we have pretty up to date positions | ||
4842 | PhysicsScene.Simulate(0); | ||
4843 | |||
4844 | ILandObject nearestParcel = GetNearestAllowedParcel(avatar.UUID, avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); | 4841 | ILandObject nearestParcel = GetNearestAllowedParcel(avatar.UUID, avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); |
4845 | 4842 | ||
4846 | if (nearestParcel != null) | 4843 | if (nearestParcel != null) |
@@ -4867,12 +4864,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
4867 | //Ultimate backup if we have no idea where they are | 4864 | //Ultimate backup if we have no idea where they are |
4868 | Debug.WriteLine("Have no idea where they are, sending them to: " + avatar.lastKnownAllowedPosition.ToString()); | 4865 | Debug.WriteLine("Have no idea where they are, sending them to: " + avatar.lastKnownAllowedPosition.ToString()); |
4869 | return avatar.lastKnownAllowedPosition; | 4866 | return avatar.lastKnownAllowedPosition; |
4870 | |||
4871 | } | 4867 | } |
4872 | 4868 | ||
4873 | //Go to the edge, this happens in teleporting to a region with no available parcels | 4869 | //Go to the edge, this happens in teleporting to a region with no available parcels |
4874 | Vector3 nearestRegionEdgePoint = GetNearestRegionEdgePosition(avatar); | 4870 | Vector3 nearestRegionEdgePoint = GetNearestRegionEdgePosition(avatar); |
4871 | |||
4875 | //Debug.WriteLine("They are really in a place they don't belong, sending them to: " + nearestRegionEdgePoint.ToString()); | 4872 | //Debug.WriteLine("They are really in a place they don't belong, sending them to: " + nearestRegionEdgePoint.ToString()); |
4873 | |||
4876 | return nearestRegionEdgePoint; | 4874 | return nearestRegionEdgePoint; |
4877 | } | 4875 | } |
4878 | 4876 | ||