Remove bizarre call to PhysicsScene.Simulate(0) in Scene.GetNearestAllowedPosition()
At least on ODE, this wasn't doing any harm but there wasn't any point to it eitheriar_mods
parent
2ae5b40ca6
commit
8e32ce85a7
|
@ -4633,9 +4633,6 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
|
||||
public Vector3? GetNearestAllowedPosition(ScenePresence avatar)
|
||||
{
|
||||
//simulate to make sure we have pretty up to date positions
|
||||
PhysicsScene.Simulate(0);
|
||||
|
||||
ILandObject nearestParcel = GetNearestAllowedParcel(avatar.UUID, avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
|
||||
|
||||
if (nearestParcel != null)
|
||||
|
@ -4662,12 +4659,13 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
//Ultimate backup if we have no idea where they are
|
||||
Debug.WriteLine("Have no idea where they are, sending them to: " + avatar.lastKnownAllowedPosition.ToString());
|
||||
return avatar.lastKnownAllowedPosition;
|
||||
|
||||
}
|
||||
|
||||
//Go to the edge, this happens in teleporting to a region with no available parcels
|
||||
Vector3 nearestRegionEdgePoint = GetNearestRegionEdgePosition(avatar);
|
||||
|
||||
//Debug.WriteLine("They are really in a place they don't belong, sending them to: " + nearestRegionEdgePoint.ToString());
|
||||
|
||||
return nearestRegionEdgePoint;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue