From 39eab72d7c4912a79bf5ce147fad8bf359d27273 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Sat, 29 Nov 2014 00:16:23 +0000
Subject: [PATCH] When performing region cross, don't add the velocity to the
 new position in ETM.CrossAgentIntoNewRegionMain() since this has already been
 performed by SP.CheckForBorderCrossing()

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

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 09e8204f69..cb32eec31f 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1695,7 +1695,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             {
                 AgentData cAgent = new AgentData(); 
                 agent.CopyTo(cAgent);
-                cAgent.Position = pos + agent.Velocity;
+                cAgent.Position = pos;
+
                 if (isFlying)
                     cAgent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY;