diff options
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODEPrim.cs')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index c1e54da..c01626a 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -759,7 +759,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
759 | if (m_taintselected != m_isSelected) | 759 | if (m_taintselected != m_isSelected) |
760 | changeSelectedStatus(timestep); | 760 | changeSelectedStatus(timestep); |
761 | 761 | ||
762 | if (!m_taintVelocity.IsIdentical(PhysicsVector.Zero,0)) | 762 | if (!m_taintVelocity.IsIdentical(PhysicsVector.Zero, 0.001f)) |
763 | changevelocity(timestep); | 763 | changevelocity(timestep); |
764 | 764 | ||
765 | if (m_taintparent != _parent) | 765 | if (m_taintparent != _parent) |
@@ -918,18 +918,18 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
918 | 918 | ||
919 | m_targetSpace = targetspace; | 919 | m_targetSpace = targetspace; |
920 | 920 | ||
921 | //if (_mesh == null) | 921 | if (_mesh == null) |
922 | //{ | 922 | { |
923 | // if (_parent_scene.needsMeshing(_pbs)) | 923 | if (_parent_scene.needsMeshing(_pbs)) |
924 | // { | 924 | { |
925 | // // Don't need to re-enable body.. it's done in SetMesh | 925 | // Don't need to re-enable body.. it's done in SetMesh |
926 | // _mesh = _parent_scene.mesher.CreateMesh(m_primName, _pbs, _size, _parent_scene.meshSculptLOD, IsPhysical); | 926 | _mesh = _parent_scene.mesher.CreateMesh(m_primName, _pbs, _size, _parent_scene.meshSculptLOD, IsPhysical); |
927 | // // createmesh returns null when it's a shape that isn't a cube. | 927 | // createmesh returns null when it's a shape that isn't a cube. |
928 | // } | 928 | } |
929 | //} | 929 | } |
930 | 930 | ||
931 | if (_mesh == null ) | 931 | //if (_mesh == null ) |
932 | _mesh = _parent_scene.mesher.CreateMesh(m_primName, _pbs, _size, _parent_scene.meshSculptLOD, IsPhysical); | 932 | // _mesh = _parent_scene.mesher.CreateMesh(m_primName, _pbs, _size, _parent_scene.meshSculptLOD, IsPhysical); |
933 | 933 | ||
934 | 934 | ||
935 | lock (OdeScene.OdeLock) | 935 | lock (OdeScene.OdeLock) |
@@ -1323,7 +1323,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1323 | // we don't need to do space calculation because the client sends a position update also. | 1323 | // we don't need to do space calculation because the client sends a position update also. |
1324 | 1324 | ||
1325 | // Construction of new prim | 1325 | // Construction of new prim |
1326 | //if (_parent_scene.needsMeshing(_pbs)) | 1326 | if (_parent_scene.needsMeshing(_pbs)) |
1327 | { | 1327 | { |
1328 | float meshlod = _parent_scene.meshSculptLOD; | 1328 | float meshlod = _parent_scene.meshSculptLOD; |
1329 | 1329 | ||
@@ -1609,7 +1609,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1609 | if (_size.Z <= 0) _size.Z = 0.01f; | 1609 | if (_size.Z <= 0) _size.Z = 0.01f; |
1610 | // Construction of new prim | 1610 | // Construction of new prim |
1611 | 1611 | ||
1612 | //if (_parent_scene.needsMeshing(_pbs)) | 1612 | if (_parent_scene.needsMeshing(_pbs)) |
1613 | { | 1613 | { |
1614 | // Don't need to re-enable body.. it's done in SetMesh | 1614 | // Don't need to re-enable body.. it's done in SetMesh |
1615 | float meshlod = _parent_scene.meshSculptLOD; | 1615 | float meshlod = _parent_scene.meshSculptLOD; |