1 files changed, 4 insertions, 0 deletions

diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 795224e..8b8373d 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -270,6 +270,7 @@ namespace OpenSim.Region.Environment.Scenes
                 }
 
                 m_pos = value;
+                                m_parentPosition=new LLVector3(0, 0, 0);
             }
         }
 
@@ -602,7 +603,10 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="pos"></param>
         public void Teleport(LLVector3 pos)
         {
+                        RemoveFromPhysicalScene();
+                        Velocity = new LLVector3(0, 0, 0);
             AbsolutePosition = pos;
+                        AddToPhysicalScene();
             SendTerseUpdateToAllClients();
         }