diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 6cfd332..f1de415 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -150,7 +150,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
150 | { | 150 | { |
151 | client.OnTeleportHomeRequest += TriggerTeleportHome; | 151 | client.OnTeleportHomeRequest += TriggerTeleportHome; |
152 | client.OnTeleportLandmarkRequest += RequestTeleportLandmark; | 152 | client.OnTeleportLandmarkRequest += RequestTeleportLandmark; |
153 | client.OnTeleportCancel += TeleportCancel; | ||
154 | } | 153 | } |
155 | 154 | ||
156 | public virtual void Close() {} | 155 | public virtual void Close() {} |
@@ -1020,11 +1019,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1020 | return neighbourRegion; | 1019 | return neighbourRegion; |
1021 | } | 1020 | } |
1022 | 1021 | ||
1023 | private void TeleportCancel(IClientAPI remoteClient) | ||
1024 | { | ||
1025 | m_entityTransferStateMachine.ResetFromTransit(remoteClient.AgentId); | ||
1026 | } | ||
1027 | |||
1028 | public bool Cross(ScenePresence agent, bool isFlying) | 1022 | public bool Cross(ScenePresence agent, bool isFlying) |
1029 | { | 1023 | { |
1030 | uint x; | 1024 | uint x; |