Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

0.7.4.1
Melanie 2012-04-25 04:01:55 +01:00
commit 550ff3b4da
1 changed files with 1 additions and 0 deletions

View File

@ -215,6 +215,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
sp.ControllingClient.SendTeleportStart(teleportFlags); sp.ControllingClient.SendTeleportStart(teleportFlags);
sp.ControllingClient.SendLocalTeleport(position, lookAt, teleportFlags); sp.ControllingClient.SendLocalTeleport(position, lookAt, teleportFlags);
sp.Velocity = Vector3.Zero;
sp.Teleport(position); sp.Teleport(position);
foreach (SceneObjectGroup grp in sp.GetAttachments()) foreach (SceneObjectGroup grp in sp.GetAttachments())