Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

1 files changed, 7 insertions, 2 deletions

diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
index f083d38..ce67cc4 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
@@ -1104,7 +1104,12 @@ namespace OpenSim.Region.Physics.OdePlugin
 

             m_building = true; // control must set this to false when done

 

-            _parent_scene.m_meshWorker.NewActorPhysRep(this, _pbs, _size, m_shapetype);

+            // get basic mass parameters

+            ODEPhysRepData repData = _parent_scene.m_meshWorker.NewActorPhysRep(this, _pbs, _size, m_shapetype);

+

+            primVolume = repData.volume;

+

+            UpdatePrimBodyData();

         }

 

         private void resetCollisionAccounting()

@@ -1466,7 +1471,7 @@ namespace OpenSim.Region.Physics.OdePlugin
 

             m_NoColide = false;

 

-            if ((m_meshState & MeshState.FailMask) != 0)

+            if ((m_meshState & MeshState.MeshNoColide) != 0)

                 m_NoColide = true;

 

             else if(m_mesh != null)