aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-04-25 03:47:26 +0100
committerJustin Clark-Casey (justincc)2012-04-25 03:47:26 +0100
commitaf86e2939c54837d47303668266ca314d405fb37 (patch)
tree9545ce16c893d9e4f709a45677e626510f0af50c /OpenSim/Region
parentrefactor: Combine ScenePresence.Teleport() and TeleportWithMomentum() (diff)
downloadopensim-SC_OLD-af86e2939c54837d47303668266ca314d405fb37.zip
opensim-SC_OLD-af86e2939c54837d47303668266ca314d405fb37.tar.gz
opensim-SC_OLD-af86e2939c54837d47303668266ca314d405fb37.tar.bz2
opensim-SC_OLD-af86e2939c54837d47303668266ca314d405fb37.tar.xz
zero out SP velocity before calling SP.Teleport(), as the client expects (though this is also effectively done by physics at the moment)
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 221e0bd..f094346 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -215,6 +215,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
215 sp.ControllingClient.SendTeleportStart(teleportFlags); 215 sp.ControllingClient.SendTeleportStart(teleportFlags);
216 216
217 sp.ControllingClient.SendLocalTeleport(position, lookAt, teleportFlags); 217 sp.ControllingClient.SendLocalTeleport(position, lookAt, teleportFlags);
218 sp.Velocity = Vector3.Zero;
218 sp.Teleport(position); 219 sp.Teleport(position);
219 220
220 foreach (SceneObjectGroup grp in sp.GetAttachments()) 221 foreach (SceneObjectGroup grp in sp.GetAttachments())