diff options
| author | Melanie | 2012-01-11 19:00:17 +0100 |
|---|---|---|
| committer | Melanie | 2012-01-11 19:00:17 +0100 |
| commit | 1a3a1e6665909f1d0f3b25f70f0a08c60dc4ab16 (patch) | |
| tree | 4fe34bb0f0e208c0f5f02c5532287835d65ebd9d /OpenSim/Region | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-1a3a1e6665909f1d0f3b25f70f0a08c60dc4ab16.zip opensim-SC-1a3a1e6665909f1d0f3b25f70f0a08c60dc4ab16.tar.gz opensim-SC-1a3a1e6665909f1d0f3b25f70f0a08c60dc4ab16.tar.bz2 opensim-SC-1a3a1e6665909f1d0f3b25f70f0a08c60dc4ab16.tar.xz | |
Adapt a cast to using the new TeleportFlags
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 843ea36..80cb623 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -204,7 +204,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 204 | sp.ControllingClient.SendTeleportStart(teleportFlags); | 204 | sp.ControllingClient.SendTeleportStart(teleportFlags); |
| 205 | 205 | ||
| 206 | sp.ControllingClient.SendLocalTeleport(position, lookAt, teleportFlags); | 206 | sp.ControllingClient.SendLocalTeleport(position, lookAt, teleportFlags); |
| 207 | sp.TeleportFlags = (TeleportFlags)teleportFlags; | 207 | sp.TeleportFlags = (Constants.TeleportFlags)teleportFlags; |
| 208 | sp.Teleport(position); | 208 | sp.Teleport(position); |
| 209 | 209 | ||
| 210 | foreach (SceneObjectGroup grp in sp.GetAttachments()) | 210 | foreach (SceneObjectGroup grp in sp.GetAttachments()) |