From ee18db027c67d3ea9b905f4d07bd5a2ec8fdf65f Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Sat, 23 Feb 2013 21:00:05 +0000
Subject: [PATCH] Make sure state machine is reset if crossing is aborted

---
 .../Framework/EntityTransfer/EntityTransferModule.cs        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 6f18e1c971..6cfd3324b9 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1132,10 +1132,16 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             bool isFlying, string version)
         {
             if (!CrossAgentToNewRegionPrep(agent, neighbourRegion))
+            {
+                m_entityTransferStateMachine.ResetFromTransit(agent.UUID);
                 return agent;
+            }
 
             if (!CrossAgentIntoNewRegionMain(agent, pos, neighbourRegion, isFlying))
+            {
+                m_entityTransferStateMachine.ResetFromTransit(agent.UUID);
                 return agent;
+            }
 
             CrossAgentToNewRegionPost(agent, pos, neighbourRegion, isFlying, version);
             return agent;