aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
diff options
context:
space:
mode:
authorUbitUmarov2012-10-16 11:26:05 +0100
committerUbitUmarov2012-10-16 11:26:05 +0100
commit91b83fd45e8648febc8176aa50110ff60ece167c (patch)
treea2f511e673515d626a6d77d76a100a48e38f3d9f /OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
parent missing file (diff)
downloadopensim-SC_OLD-91b83fd45e8648febc8176aa50110ff60ece167c.zip
opensim-SC_OLD-91b83fd45e8648febc8176aa50110ff60ece167c.tar.gz
opensim-SC_OLD-91b83fd45e8648febc8176aa50110ff60ece167c.tar.bz2
opensim-SC_OLD-91b83fd45e8648febc8176aa50110ff60ece167c.tar.xz
fixes
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs')
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs9
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
1104 1104
1105 m_building = true; // control must set this to false when done 1105 m_building = true; // control must set this to false when done
1106 1106
1107 _parent_scene.m_meshWorker.NewActorPhysRep(this, _pbs, _size, m_shapetype); 1107 // get basic mass parameters
1108 ODEPhysRepData repData = _parent_scene.m_meshWorker.NewActorPhysRep(this, _pbs, _size, m_shapetype);
1109
1110 primVolume = repData.volume;
1111
1112 UpdatePrimBodyData();
1108 } 1113 }
1109 1114
1110 private void resetCollisionAccounting() 1115 private void resetCollisionAccounting()
@@ -1466,7 +1471,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1466 1471
1467 m_NoColide = false; 1472 m_NoColide = false;
1468 1473
1469 if ((m_meshState & MeshState.FailMask) != 0) 1474 if ((m_meshState & MeshState.MeshNoColide) != 0)
1470 m_NoColide = true; 1475 m_NoColide = true;
1471 1476
1472 else if(m_mesh != null) 1477 else if(m_mesh != null)