aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-11-21 19:48:31 +0000
committerJustin Clark-Casey (justincc)2011-11-21 19:48:31 +0000
commit225b925f4ec6a0b7dfec27589d0aea40ce0a8e54 (patch)
tree773c691bfeb6fdf34ef4f73b03e78ffaf8b88f5d /OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
parentReduce complexity of OdeScene.Simulate() by fully removing bad characters at ... (diff)
downloadopensim-SC-225b925f4ec6a0b7dfec27589d0aea40ce0a8e54.zip
opensim-SC-225b925f4ec6a0b7dfec27589d0aea40ce0a8e54.tar.gz
opensim-SC-225b925f4ec6a0b7dfec27589d0aea40ce0a8e54.tar.bz2
opensim-SC-225b925f4ec6a0b7dfec27589d0aea40ce0a8e54.tar.xz
Comment out calls to OdeScene.waitForSpaceUnlock() since that method does nothing right now
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs18
1 files changed, 9 insertions, 9 deletions
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
856 m_MeshToTriMeshMap[mesh] = _triMeshData; 856 m_MeshToTriMeshMap[mesh] = _triMeshData;
857 } 857 }
858 858
859 _parent_scene.waitForSpaceUnlock(m_targetSpace); 859// _parent_scene.waitForSpaceUnlock(m_targetSpace);
860 try 860 try
861 { 861 {
862 if (prim_geom == IntPtr.Zero) 862 if (prim_geom == IntPtr.Zero)
@@ -1379,7 +1379,7 @@ Console.WriteLine("CreateGeom:");
1379 { 1379 {
1380 if (((_size.X / 2f) > 0f)) 1380 if (((_size.X / 2f) > 0f))
1381 { 1381 {
1382 _parent_scene.waitForSpaceUnlock(m_targetSpace); 1382// _parent_scene.waitForSpaceUnlock(m_targetSpace);
1383 try 1383 try
1384 { 1384 {
1385//Console.WriteLine(" CreateGeom 1"); 1385//Console.WriteLine(" CreateGeom 1");
@@ -1393,7 +1393,7 @@ Console.WriteLine("CreateGeom:");
1393 } 1393 }
1394 else 1394 else
1395 { 1395 {
1396 _parent_scene.waitForSpaceUnlock(m_targetSpace); 1396// _parent_scene.waitForSpaceUnlock(m_targetSpace);
1397 try 1397 try
1398 { 1398 {
1399//Console.WriteLine(" CreateGeom 2"); 1399//Console.WriteLine(" CreateGeom 2");
@@ -1408,7 +1408,7 @@ Console.WriteLine("CreateGeom:");
1408 } 1408 }
1409 else 1409 else
1410 { 1410 {
1411 _parent_scene.waitForSpaceUnlock(m_targetSpace); 1411// _parent_scene.waitForSpaceUnlock(m_targetSpace);
1412 try 1412 try
1413 { 1413 {
1414//Console.WriteLine(" CreateGeom 3"); 1414//Console.WriteLine(" CreateGeom 3");
@@ -1423,7 +1423,7 @@ Console.WriteLine("CreateGeom:");
1423 } 1423 }
1424 else 1424 else
1425 { 1425 {
1426 _parent_scene.waitForSpaceUnlock(m_targetSpace); 1426// _parent_scene.waitForSpaceUnlock(m_targetSpace);
1427 try 1427 try
1428 { 1428 {
1429//Console.WriteLine(" CreateGeom 4"); 1429//Console.WriteLine(" CreateGeom 4");
@@ -1576,17 +1576,17 @@ Console.WriteLine(" JointCreateFixed");
1576 { 1576 {
1577 // string primScenAvatarIn = _parent_scene.whichspaceamIin(_position); 1577 // string primScenAvatarIn = _parent_scene.whichspaceamIin(_position);
1578 // int[] arrayitem = _parent_scene.calculateSpaceArrayItemFromPos(_position); 1578 // int[] arrayitem = _parent_scene.calculateSpaceArrayItemFromPos(_position);
1579 _parent_scene.waitForSpaceUnlock(m_targetSpace); 1579// _parent_scene.waitForSpaceUnlock(m_targetSpace);
1580 1580
1581 IntPtr tempspace = _parent_scene.recalculateSpaceForGeom(prim_geom, _position, m_targetSpace); 1581 IntPtr tempspace = _parent_scene.recalculateSpaceForGeom(prim_geom, _position, m_targetSpace);
1582 m_targetSpace = tempspace; 1582 m_targetSpace = tempspace;
1583 1583
1584 _parent_scene.waitForSpaceUnlock(m_targetSpace); 1584// _parent_scene.waitForSpaceUnlock(m_targetSpace);
1585 if (prim_geom != IntPtr.Zero) 1585 if (prim_geom != IntPtr.Zero)
1586 { 1586 {
1587 d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z); 1587 d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
1588 1588
1589 _parent_scene.waitForSpaceUnlock(m_targetSpace); 1589// _parent_scene.waitForSpaceUnlock(m_targetSpace);
1590 d.SpaceAdd(m_targetSpace, prim_geom); 1590 d.SpaceAdd(m_targetSpace, prim_geom);
1591 } 1591 }
1592 } 1592 }
@@ -1977,7 +1977,7 @@ Console.WriteLine(" JointCreateFixed");
1977 1977
1978 if (d.SpaceQuery(m_targetSpace, prim_geom)) 1978 if (d.SpaceQuery(m_targetSpace, prim_geom))
1979 { 1979 {
1980 _parent_scene.waitForSpaceUnlock(m_targetSpace); 1980// _parent_scene.waitForSpaceUnlock(m_targetSpace);
1981 d.SpaceRemove(m_targetSpace, prim_geom); 1981 d.SpaceRemove(m_targetSpace, prim_geom);
1982 } 1982 }
1983 1983