Merge commit 'f10a824e47549806c1fa647c4e9fba4c8cf6ad13' into bigmerge

1 files changed, 13 insertions, 18 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 29bdd21..6638cbd 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -1494,30 +1494,25 @@ Console.WriteLine("CreateGeom:");
                // m_log.Debug(m_localID);
             }
 
-            lock (_parent_scene.OdeLock)
-            {
 #if SPAM
 Console.WriteLine("changeadd 1");
 #endif
-                CreateGeom(m_targetSpace, mesh);
-
-                if (prim_geom != IntPtr.Zero)
-                {
-                    d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
-                    d.Quaternion myrot = new d.Quaternion();
-                    myrot.X = _orientation.X;
-                    myrot.Y = _orientation.Y;
-                    myrot.Z = _orientation.Z;
-                    myrot.W = _orientation.W;
-                    d.GeomSetQuaternion(prim_geom, ref myrot);
-                }
+            CreateGeom(m_targetSpace, mesh);
 
-                if (IsPhysical && Body == IntPtr.Zero)
-                {
-                    enableBody();
-                }
+            if (prim_geom != IntPtr.Zero)
+            {
+                d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
+                d.Quaternion myrot = new d.Quaternion();
+                myrot.X = _orientation.X;
+                myrot.Y = _orientation.Y;
+                myrot.Z = _orientation.Z;
+                myrot.W = _orientation.W;
+                d.GeomSetQuaternion(prim_geom, ref myrot);
             }
 
+            if (IsPhysical && Body == IntPtr.Zero)
+                enableBody();
+
             changeSelectedStatus();
 
             m_taintadd = false;