From 225b925f4ec6a0b7dfec27589d0aea40ce0a8e54 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 21 Nov 2011 19:48:31 +0000
Subject: Comment out calls to OdeScene.waitForSpaceUnlock() since that method
 does nothing right now

---
 OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Region/Physics/OdePlugin/ODEPrim.cs')

diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 5f21c9d..fec4693 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -856,7 +856,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                 m_MeshToTriMeshMap[mesh] = _triMeshData;
             }
 
-            _parent_scene.waitForSpaceUnlock(m_targetSpace);
+//            _parent_scene.waitForSpaceUnlock(m_targetSpace);
             try
             {
                 if (prim_geom == IntPtr.Zero)
@@ -1379,7 +1379,7 @@ Console.WriteLine("CreateGeom:");
                     {
                         if (((_size.X / 2f) > 0f))
                         {
-                            _parent_scene.waitForSpaceUnlock(m_targetSpace);
+//                            _parent_scene.waitForSpaceUnlock(m_targetSpace);
                             try
                             {
 //Console.WriteLine(" CreateGeom 1");
@@ -1393,7 +1393,7 @@ Console.WriteLine("CreateGeom:");
                         }
                         else
                         {
-                            _parent_scene.waitForSpaceUnlock(m_targetSpace);
+//                            _parent_scene.waitForSpaceUnlock(m_targetSpace);
                             try
                             {
 //Console.WriteLine(" CreateGeom 2");
@@ -1408,7 +1408,7 @@ Console.WriteLine("CreateGeom:");
                     }
                     else
                     {
-                        _parent_scene.waitForSpaceUnlock(m_targetSpace);
+//                        _parent_scene.waitForSpaceUnlock(m_targetSpace);
                         try
                         {
 //Console.WriteLine("  CreateGeom 3");
@@ -1423,7 +1423,7 @@ Console.WriteLine("CreateGeom:");
                 }
                 else
                 {
-                    _parent_scene.waitForSpaceUnlock(m_targetSpace);
+//                    _parent_scene.waitForSpaceUnlock(m_targetSpace);
                     try
                     {
 //Console.WriteLine("  CreateGeom 4");
@@ -1576,17 +1576,17 @@ Console.WriteLine(" JointCreateFixed");
             {
                 // string primScenAvatarIn = _parent_scene.whichspaceamIin(_position);
                 // int[] arrayitem = _parent_scene.calculateSpaceArrayItemFromPos(_position);
-                _parent_scene.waitForSpaceUnlock(m_targetSpace);
+//                _parent_scene.waitForSpaceUnlock(m_targetSpace);
 
                 IntPtr tempspace = _parent_scene.recalculateSpaceForGeom(prim_geom, _position, m_targetSpace);
                 m_targetSpace = tempspace;
 
-                _parent_scene.waitForSpaceUnlock(m_targetSpace);
+//                _parent_scene.waitForSpaceUnlock(m_targetSpace);
                 if (prim_geom != IntPtr.Zero)
                 {
                     d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
 
-                    _parent_scene.waitForSpaceUnlock(m_targetSpace);
+//                    _parent_scene.waitForSpaceUnlock(m_targetSpace);
                     d.SpaceAdd(m_targetSpace, prim_geom);
                 }
             }
@@ -1977,7 +1977,7 @@ Console.WriteLine(" JointCreateFixed");
 
             if (d.SpaceQuery(m_targetSpace, prim_geom))
             {
-                _parent_scene.waitForSpaceUnlock(m_targetSpace);
+//                _parent_scene.waitForSpaceUnlock(m_targetSpace);
                 d.SpaceRemove(m_targetSpace, prim_geom);
             }
 
-- 
cgit v1.1