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