From a5ea9f883092ca7b54aeb1c6e3abb8a5ebed1dc7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 29 Oct 2011 01:46:22 +0100
Subject: Move position set from taint to logically better position at top of
 ODECharacter.ProcessTaints() though this makes no practical difference

---
 OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'OpenSim/Region/Physics')

diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 5ad7616..ca8fef9 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -1250,6 +1250,18 @@ namespace OpenSim.Region.Physics.OdePlugin
 
         internal void ProcessTaints()
         {
+            if (m_taintPosition != _position)
+            {
+                if (Body != IntPtr.Zero)
+                {
+                    d.BodySetPosition(Body, m_taintPosition.X, m_taintPosition.Y, m_taintPosition.Z);
+
+                    _position.X = m_taintPosition.X;
+                    _position.Y = m_taintPosition.Y;
+                    _position.Z = m_taintPosition.Z;
+                }
+            }
+
             if (m_tainted_isPhysical != m_isPhysical)
             {
                 if (m_tainted_isPhysical)
@@ -1309,18 +1321,6 @@ namespace OpenSim.Region.Physics.OdePlugin
                         + (Amotor==IntPtr.Zero ? "Amotor ":""));
                 }
             }
-
-            if (!m_taintPosition.ApproxEquals(_position, 0.05f))
-            {
-                if (Body != IntPtr.Zero)
-                {
-                    d.BodySetPosition(Body, m_taintPosition.X, m_taintPosition.Y, m_taintPosition.Z);
-
-                    _position.X = m_taintPosition.X;
-                    _position.Y = m_taintPosition.Y;
-                    _position.Z = m_taintPosition.Z;
-                }
-            }
         }
 
         internal void AddCollisionFrameTime(int p)
-- 
cgit v1.1