diff options
author | ubit | 2012-10-16 12:27:37 +0200 |
---|---|---|
committer | ubit | 2012-10-16 12:27:37 +0200 |
commit | 10ed5b08c74d8f28919d820161bf48f2a8d56a0a (patch) | |
tree | d0f1f2bd360a7a57fbdce2dc3357f3d9d385cb7f /OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | |
parent | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
parent | fixes (diff) | |
download | opensim-SC_OLD-10ed5b08c74d8f28919d820161bf48f2a8d56a0a.zip opensim-SC_OLD-10ed5b08c74d8f28919d820161bf48f2a8d56a0a.tar.gz opensim-SC_OLD-10ed5b08c74d8f28919d820161bf48f2a8d56a0a.tar.bz2 opensim-SC_OLD-10ed5b08c74d8f28919d820161bf48f2a8d56a0a.tar.xz |
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs')
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | 9 |
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) |