diff options
| author | Diva Canto | 2012-04-24 22:17:52 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-04-24 22:17:52 -0700 |
| commit | fd281ded3fe341f7ce994171beb5ff12b154a761 (patch) | |
| tree | 5a873cc862bb60803808e8bbb3a9058411b4f102 /OpenSim/Region/CoreModules | |
| parent | HG: Moved User-level code down to the HGEntityTransferModule where it belongs. (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-fd281ded3fe341f7ce994171beb5ff12b154a761.zip opensim-SC_OLD-fd281ded3fe341f7ce994171beb5ff12b154a761.tar.gz opensim-SC_OLD-fd281ded3fe341f7ce994171beb5ff12b154a761.tar.bz2 opensim-SC_OLD-fd281ded3fe341f7ce994171beb5ff12b154a761.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 1 |
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 8d810fc..a36d0fe 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -212,6 +212,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 212 | sp.ControllingClient.SendTeleportStart(teleportFlags); | 212 | sp.ControllingClient.SendTeleportStart(teleportFlags); |
| 213 | 213 | ||
| 214 | sp.ControllingClient.SendLocalTeleport(position, lookAt, teleportFlags); | 214 | sp.ControllingClient.SendLocalTeleport(position, lookAt, teleportFlags); |
| 215 | sp.Velocity = Vector3.Zero; | ||
| 215 | sp.Teleport(position); | 216 | sp.Teleport(position); |
| 216 | 217 | ||
| 217 | foreach (SceneObjectGroup grp in sp.GetAttachments()) | 218 | foreach (SceneObjectGroup grp in sp.GetAttachments()) |