diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 1f79cd8..7d67da3 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -1579,23 +1579,21 @@ Console.WriteLine(" JointCreateFixed"); | |||
1579 | //m_log.Debug("[BUG]: race!"); | 1579 | //m_log.Debug("[BUG]: race!"); |
1580 | //} | 1580 | //} |
1581 | } | 1581 | } |
1582 | else | ||
1583 | { | ||
1584 | // string primScenAvatarIn = _parent_scene.whichspaceamIin(_position); | ||
1585 | // int[] arrayitem = _parent_scene.calculateSpaceArrayItemFromPos(_position); | ||
1586 | // _parent_scene.waitForSpaceUnlock(m_targetSpace); | ||
1587 | 1582 | ||
1588 | IntPtr tempspace = _parent_scene.recalculateSpaceForGeom(prim_geom, _position, m_targetSpace); | 1583 | // string primScenAvatarIn = _parent_scene.whichspaceamIin(_position); |
1589 | m_targetSpace = tempspace; | 1584 | // int[] arrayitem = _parent_scene.calculateSpaceArrayItemFromPos(_position); |
1585 | // _parent_scene.waitForSpaceUnlock(m_targetSpace); | ||
1586 | |||
1587 | IntPtr tempspace = _parent_scene.recalculateSpaceForGeom(prim_geom, _position, m_targetSpace); | ||
1588 | m_targetSpace = tempspace; | ||
1590 | 1589 | ||
1591 | // _parent_scene.waitForSpaceUnlock(m_targetSpace); | 1590 | // _parent_scene.waitForSpaceUnlock(m_targetSpace); |
1592 | if (prim_geom != IntPtr.Zero) | 1591 | if (prim_geom != IntPtr.Zero) |
1593 | { | 1592 | { |
1594 | d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z); | 1593 | d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z); |
1595 | 1594 | ||
1596 | // _parent_scene.waitForSpaceUnlock(m_targetSpace); | 1595 | // _parent_scene.waitForSpaceUnlock(m_targetSpace); |
1597 | d.SpaceAdd(m_targetSpace, prim_geom); | 1596 | d.SpaceAdd(m_targetSpace, prim_geom); |
1598 | } | ||
1599 | } | 1597 | } |
1600 | 1598 | ||
1601 | changeSelectedStatus(); | 1599 | changeSelectedStatus(); |