diff options
| author | Justin Clark-Casey (justincc) | 2011-05-27 21:21:01 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-05-27 21:21:01 +0100 |
| commit | b0c9696de0a4f30a4ceab030f369adce57c9bff4 (patch) | |
| tree | 496b6e0a7d132f1bcd7c1d2a1bb6085246e4b16f /OpenSim/Region/Framework | |
| parent | Make sure culture is en-US when saving archive related xml. (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-b0c9696de0a4f30a4ceab030f369adce57c9bff4.zip opensim-SC_OLD-b0c9696de0a4f30a4ceab030f369adce57c9bff4.tar.gz opensim-SC_OLD-b0c9696de0a4f30a4ceab030f369adce57c9bff4.tar.bz2 opensim-SC_OLD-b0c9696de0a4f30a4ceab030f369adce57c9bff4.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs index 8b96de4..07e97d5 100644 --- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | |||
| @@ -40,6 +40,9 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 40 | void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position, | 40 | void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position, |
| 41 | Vector3 lookAt, uint teleportFlags); | 41 | Vector3 lookAt, uint teleportFlags); |
| 42 | 42 | ||
| 43 | void DoTeleport(ScenePresence sp, GridRegion reg, GridRegion finalDestination, | ||
| 44 | Vector3 position, Vector3 lookAt, uint teleportFlags, IEventQueue eq); | ||
| 45 | |||
| 43 | void TeleportHome(UUID id, IClientAPI client); | 46 | void TeleportHome(UUID id, IClientAPI client); |
| 44 | 47 | ||
| 45 | bool Cross(ScenePresence agent, bool isFlying); | 48 | bool Cross(ScenePresence agent, bool isFlying); |