From 225b925f4ec6a0b7dfec27589d0aea40ce0a8e54 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Mon, 21 Nov 2011 19:48:31 +0000 Subject: [PATCH] Comment out calls to OdeScene.waitForSpaceUnlock() since that method does nothing right now --- .../Region/Physics/OdePlugin/ODECharacter.cs | 4 +-- OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 18 ++++++------- OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 25 ++++++++++--------- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index c838587505..af67407629 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs @@ -557,7 +557,7 @@ namespace OpenSim.Region.Physics.OdePlugin //CAPSULE_LENGTH = -5; //CAPSULE_RADIUS = -5; int dAMotorEuler = 1; - _parent_scene.waitForSpaceUnlock(_parent_scene.space); +// _parent_scene.waitForSpaceUnlock(_parent_scene.space); if (CAPSULE_LENGTH <= 0) { m_log.Warn("[ODE CHARACTER]: The capsule size you specified in opensim.ini is invalid! Setting it to the smallest possible size!"); @@ -1155,7 +1155,7 @@ namespace OpenSim.Region.Physics.OdePlugin } //kill the Geometry - _parent_scene.waitForSpaceUnlock(_parent_scene.space); +// _parent_scene.waitForSpaceUnlock(_parent_scene.space); if (Body != IntPtr.Zero) { diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 5f21c9db52..fec46939f5 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); } diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index 9c3c07788d..b952b306d3 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs @@ -679,11 +679,11 @@ namespace OpenSim.Region.Physics.OdePlugin } } - internal void waitForSpaceUnlock(IntPtr space) - { - //if (space != IntPtr.Zero) - //while (d.SpaceLockQuery(space)) { } // Wait and do nothing - } +// internal void waitForSpaceUnlock(IntPtr space) +// { +// //if (space != IntPtr.Zero) +// //while (d.SpaceLockQuery(space)) { } // Wait and do nothing +// } // /// // /// Debug space message for printing the space that a prim/avatar is in. @@ -2303,7 +2303,7 @@ namespace OpenSim.Region.Physics.OdePlugin { if (d.GeomIsSpace(currentspace)) { - waitForSpaceUnlock(currentspace); +// waitForSpaceUnlock(currentspace); d.SpaceRemove(currentspace, geom); } else @@ -2319,7 +2319,7 @@ namespace OpenSim.Region.Physics.OdePlugin { if (d.GeomIsSpace(currentspace)) { - waitForSpaceUnlock(sGeomIsIn); +// waitForSpaceUnlock(sGeomIsIn); d.SpaceRemove(sGeomIsIn, geom); } else @@ -2337,8 +2337,8 @@ namespace OpenSim.Region.Physics.OdePlugin { if (d.GeomIsSpace(currentspace)) { - waitForSpaceUnlock(currentspace); - waitForSpaceUnlock(space); +// waitForSpaceUnlock(currentspace); +// waitForSpaceUnlock(space); d.SpaceRemove(space, currentspace); // free up memory used by the space. @@ -2362,7 +2362,7 @@ namespace OpenSim.Region.Physics.OdePlugin { if (d.GeomIsSpace(currentspace)) { - waitForSpaceUnlock(currentspace); +// waitForSpaceUnlock(currentspace); d.SpaceRemove(currentspace, geom); } else @@ -2378,7 +2378,7 @@ namespace OpenSim.Region.Physics.OdePlugin { if (d.GeomIsSpace(sGeomIsIn)) { - waitForSpaceUnlock(sGeomIsIn); +// waitForSpaceUnlock(sGeomIsIn); d.SpaceRemove(sGeomIsIn, geom); } else @@ -2417,9 +2417,10 @@ namespace OpenSim.Region.Physics.OdePlugin // creating a new space for prim and inserting it into main space. staticPrimspace[iprimspaceArrItemX, iprimspaceArrItemY] = d.HashSpaceCreate(IntPtr.Zero); d.GeomSetCategoryBits(staticPrimspace[iprimspaceArrItemX, iprimspaceArrItemY], (int)CollisionCategories.Space); - waitForSpaceUnlock(space); +// waitForSpaceUnlock(space); d.SpaceSetSublevel(space, 1); d.SpaceAdd(space, staticPrimspace[iprimspaceArrItemX, iprimspaceArrItemY]); + return staticPrimspace[iprimspaceArrItemX, iprimspaceArrItemY]; }