diff options
| author | Melanie | 2012-04-25 04:01:55 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-25 04:01:55 +0100 |
| commit | 550ff3b4daa721b3e78fd39691553259b32529e0 (patch) | |
| tree | 97230e013c1bf2908bb67cdc03df242308f308eb | |
| parent | Commit the avination Teleport() methods (adaptedto justincc's changes) (diff) | |
| parent | zero out SP velocity before calling SP.Teleport(), as the client expects (tho... (diff) | |
| download | opensim-SC-550ff3b4daa721b3e78fd39691553259b32529e0.zip opensim-SC-550ff3b4daa721b3e78fd39691553259b32529e0.tar.gz opensim-SC-550ff3b4daa721b3e78fd39691553259b32529e0.tar.bz2 opensim-SC-550ff3b4daa721b3e78fd39691553259b32529e0.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
| -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 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()) |