aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-05-01 17:52:30 +0100
committerJustin Clark-Casey (justincc)2012-05-01 17:52:30 +0100
commit37dd174697c0bcc201f8d8e4d7569c2a51f53757 (patch)
tree7d4b0edd973bbefac317b00e75c9c991baab2904 /OpenSim/Region/Framework
parentCreate TestHelpers.EnableLogging() and DisableLogging() to turn logging on an... (diff)
downloadopensim-SC_OLD-37dd174697c0bcc201f8d8e4d7569c2a51f53757.zip
opensim-SC_OLD-37dd174697c0bcc201f8d8e4d7569c2a51f53757.tar.gz
opensim-SC_OLD-37dd174697c0bcc201f8d8e4d7569c2a51f53757.tar.bz2
opensim-SC_OLD-37dd174697c0bcc201f8d8e4d7569c2a51f53757.tar.xz
refactor: Split most of EntityTransferModule.Teleport() into its same region and different region teleport components.
DoTeleport() now retrives IEventQueue itself rather than requiring it to be passed in.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs37
1 files changed, 33 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 07e97d5..18e9e3c 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -37,12 +37,41 @@ namespace OpenSim.Region.Framework.Interfaces
37{ 37{
38 public interface IEntityTransferModule 38 public interface IEntityTransferModule
39 { 39 {
40 void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position, 40 /// <summary>
41 Vector3 lookAt, uint teleportFlags); 41 /// Teleport an agent within the same or to a different region.
42 /// </summary>
43 /// <param name='agent'></param>
44 /// <param name='regionHandle'>
45 /// The handle of the destination region. If it's the same as the region currently
46 /// occupied by the agent then the teleport will be within that region.
47 /// </param>
48 /// <param name='position'></param>
49 /// <param name='lookAt'></param>
50 /// <param name='teleportFlags'></param>
51 void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position, Vector3 lookAt, uint teleportFlags);
42 52
43 void DoTeleport(ScenePresence sp, GridRegion reg, GridRegion finalDestination, 53 /// <summary>
44 Vector3 position, Vector3 lookAt, uint teleportFlags, IEventQueue eq); 54 /// Teleport an agent directly to a given region without checking whether the region should be subsituted.
55 /// </summary>
56 /// <remarks>
57 /// Please use Teleport() instead unless you know exactly what you're doing.
58 /// Do not use for same region teleports.
59 /// </remarks>
60 /// <param name='sp'></param>
61 /// <param name='reg'></param>
62 /// <param name='finalDestination'>/param>
63 /// <param name='position'></param>
64 /// <param name='lookAt'></param>
65 /// <param name='teleportFlags'></param>
66 void DoTeleport(
67 ScenePresence sp, GridRegion reg, GridRegion finalDestination,
68 Vector3 position, Vector3 lookAt, uint teleportFlags);
45 69
70 /// <summary>
71 /// Teleports the agent for the given client to their home destination.
72 /// </summary>
73 /// <param name='id'></param>
74 /// <param name='client'></param>
46 void TeleportHome(UUID id, IClientAPI client); 75 void TeleportHome(UUID id, IClientAPI client);
47 76
48 bool Cross(ScenePresence agent, bool isFlying); 77 bool Cross(ScenePresence agent, bool isFlying);