From 405da93589856f355defc3c0c1e24c618658cc7e Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Sun, 24 Feb 2013 00:38:57 +0100
Subject: [PATCH] Revert "Allow TeleportCancel packets to reset the transfer
 state machine"

This reverts commit 0e17887e03fb6d32cdd07838caa56e34103ae8f2.
---
 .../Framework/EntityTransfer/EntityTransferModule.cs        | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index cb09047ad8..ac4d93d790 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
         {
             client.OnTeleportHomeRequest += TriggerTeleportHome;
             client.OnTeleportLandmarkRequest += RequestTeleportLandmark;
-            client.OnTeleportCancel += TeleportCancel;
         }
 
         public virtual void Close() {}
@@ -995,11 +994,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             return neighbourRegion;
         }
 
-        private void TeleportCancel(IClientAPI remoteClient)
-        {
-            m_entityTransferStateMachine.ResetFromTransit(remoteClient.AgentId);
-        }
-
         public bool Cross(ScenePresence agent, bool isFlying)
         {
             uint x;