fix GetTerrainHeightAtXY also on master. Fix wrong active angularlock detection (it was only burning cpu), stop trying to add a amotor to each child part and fix a typo.

1 files changed, 3 insertions, 8 deletions

diff --git a/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs b/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
index 445fef8..0b9c45f 100644
--- a/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
+++ b/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
@@ -445,7 +445,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
                 m_disabled = false;
 
                 // The body doesn't already have a finite rotation mode set here
-                if ((!m_angularlock.ApproxEquals(Vector3.Zero, 0.0f)) && _parent == null)
+                if ((!m_angularlock.ApproxEquals(Vector3.One, 0.0f)) && _parent == null)
                 {
                     createAMotor(m_angularlock);
                 }
@@ -1121,7 +1121,7 @@ Console.WriteLine("ZProcessTaints for " + Name);
                 {
                     d.Mass m2;
                     d.MassSetZero(out m2);
-                    d.MassSetBoxTotal(out m2, prim.CalculateMass(), prm._size.X, prm._size.Y, prm._size.Z);
+                    d.MassSetBoxTotal(out m2, prm.CalculateMass(), prm._size.X, prm._size.Y, prm._size.Z);
 
                     d.Quaternion quat = new d.Quaternion();
                     quat.W = prm._orientation.W;
@@ -1184,11 +1184,6 @@ Console.WriteLine("ZProcessTaints for " + Name);
                     prm.m_collisionscore = 0;
                     prm.m_disabled = false;
 
-                    // The body doesn't already have a finite rotation mode set here
-                    if ((!m_angularlock.ApproxEquals(Vector3.Zero, 0f)) && _parent == null)
-                    {
-                        prm.createAMotor(m_angularlock);
-                    }
                     prm.Body = Body;
                     _parent_scene.ActivatePrim(prm);
                 }
@@ -1235,7 +1230,7 @@ Console.WriteLine("ZProcessTaints for " + Name);
                 m_disabled = false;
 
                 // The body doesn't already have a finite rotation mode set here
-                if ((!m_angularlock.ApproxEquals(Vector3.Zero, 0f)) && _parent == null)
+                if ((!m_angularlock.ApproxEquals(Vector3.One, 0f)) && _parent == null)
                 {
                     createAMotor(m_angularlock);
                 }