diff options
author | UbitUmarov | 2012-02-27 20:08:43 +0000 |
---|---|---|
committer | UbitUmarov | 2012-02-27 20:08:43 +0000 |
commit | a725b5e01ed92b54d0bddd321acbe4498492f67c (patch) | |
tree | 73ba8effb7f9cf5ef3f3820e450b5d299a984acb /OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | |
parent | Merge branch 'ubitwork' (diff) | |
download | opensim-SC_OLD-a725b5e01ed92b54d0bddd321acbe4498492f67c.zip opensim-SC_OLD-a725b5e01ed92b54d0bddd321acbe4498492f67c.tar.gz opensim-SC_OLD-a725b5e01ed92b54d0bddd321acbe4498492f67c.tar.bz2 opensim-SC_OLD-a725b5e01ed92b54d0bddd321acbe4498492f67c.tar.xz |
Let inworld meshs colide as such and not as basic prim all the time. Removed also LOD, and outerskin on colision meshs.
Diffstat (limited to 'OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs')
-rw-r--r-- | OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs index 86ab58d..915b88d 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | |||
@@ -2421,7 +2421,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2421 | // Don't need to re-enable body.. it's done in SetMesh | 2421 | // Don't need to re-enable body.. it's done in SetMesh |
2422 | try | 2422 | try |
2423 | { | 2423 | { |
2424 | _mesh = _parent_scene.mesher.CreateMesh(m_primName, _pbs, _size, _parent_scene.meshSculptLOD, IsPhysical); | 2424 | _mesh = _parent_scene.mesher.CreateMesh(m_primName, _pbs, _size, (int)LevelOfDetail.High, true); |
2425 | } | 2425 | } |
2426 | catch | 2426 | catch |
2427 | { | 2427 | { |
@@ -2676,7 +2676,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2676 | try | 2676 | try |
2677 | { | 2677 | { |
2678 | if (_parent_scene.needsMeshing(_pbs)) | 2678 | if (_parent_scene.needsMeshing(_pbs)) |
2679 | mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical); | 2679 | mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, (int)LevelOfDetail.High, true); |
2680 | } | 2680 | } |
2681 | catch | 2681 | catch |
2682 | { | 2682 | { |
@@ -2783,7 +2783,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2783 | meshlod = _parent_scene.MeshSculptphysicalLOD; | 2783 | meshlod = _parent_scene.MeshSculptphysicalLOD; |
2784 | try | 2784 | try |
2785 | { | 2785 | { |
2786 | IMesh mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical); | 2786 | IMesh mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, (int)LevelOfDetail.High, true); |
2787 | CreateGeom(m_targetSpace, mesh); | 2787 | CreateGeom(m_targetSpace, mesh); |
2788 | } | 2788 | } |
2789 | catch | 2789 | catch |