refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum()

These are identical apart from setting Velocity = zero, which has no practical effect anyway since this is zeroed when the avatar is added back to the physics scene.

2 files changed, 1 insertions, 17 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 9005acd..8cb4921 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -994,22 +994,6 @@ namespace OpenSim.Region.Framework.Scenes
 
             bool isFlying = Flying;
             RemoveFromPhysicalScene();
-            Velocity = Vector3.Zero;
-            CheckLandingPoint(ref pos);
-            AbsolutePosition = pos;
-            AddToPhysicalScene(isFlying);
-
-            SendTerseUpdateToAllClients();
-        }
-
-        public void TeleportWithMomentum(Vector3 pos)
-        {
-//            m_log.DebugFormat(
-//                "[SCENE PRESENCE]: Moving {0} to {1} with existing momentum {2} in {3} ",
-//                Name, pos, Velocity, Scene.RegionInfo.RegionName);
-
-            bool isFlying = Flying;
-            RemoveFromPhysicalScene();
             CheckLandingPoint(ref pos);
             AbsolutePosition = pos;
             AddToPhysicalScene(isFlying);
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
index 922eaaf..d192309 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         public Vector3 WorldPosition
         {
             get { return GetSP().AbsolutePosition; }
-            set { GetSP().TeleportWithMomentum(value); }
+            set { GetSP().Teleport(value); }
         }
         
         public bool IsChildAgent