2 files changed, 19 insertions, 1 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 8fd4b47..8950942 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1015,6 +1015,24 @@ namespace OpenSim.Region.Framework.Scenes
             SendTerseUpdateToAllClients();
         }
 
+        public void TeleportWithMomentum(Vector3 pos)
+        {
+            bool isFlying = false;
+            if (m_physicsActor != null)
+                isFlying = m_physicsActor.Flying;
+
+            RemoveFromPhysicalScene();
+            AbsolutePosition = pos;
+            AddToPhysicalScene(isFlying);
+            if (m_appearance != null)
+            {
+                if (m_appearance.AvatarHeight > 0)
+                    SetHeight(m_appearance.AvatarHeight);
+            }
+
+            SendTerseUpdateToAllClients();
+        }
+
         /// <summary>
         ///
         /// </summary>
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
index 0f2076e..8fed89c 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         public Vector3 WorldPosition
         {
             get { return GetSP().AbsolutePosition; }
-            set { GetSP().AbsolutePosition = value; }
+            set { GetSP().TeleportWithMomentum(value); }
         }
     }
 }