1 files changed, 7 insertions, 2 deletions

diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
index f2f4725..f328066 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
@@ -1080,7 +1080,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             bounce = parent_scene.m_materialContactsData[(int)Material.Wood].bounce;

 

             CalcPrimBodyData();

-

+/*

             m_mesh = null;

             if (_parent_scene.needsMeshing(pbs) && (pbs.SculptData.Length > 0))

             {

@@ -1096,6 +1096,8 @@ namespace OpenSim.Region.Physics.OdePlugin
                 }

                 m_mesh = _parent_scene.mesher.CreateMesh(Name, _pbs, _size, clod, true, convex);

             }

+*/

+            m_mesh = _parent_scene.m_meshWorker.getMesh(this, pbs, _size, m_shapetype);

 

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

 

@@ -1351,6 +1353,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             {

                 if (m_mesh == null)

                 {

+/*

                     bool convex;

                     int clod = (int)LevelOfDetail.High;

 

@@ -1364,6 +1367,8 @@ namespace OpenSim.Region.Physics.OdePlugin
                     }

 

                     mesh = _parent_scene.mesher.CreateMesh(Name, _pbs, _size, clod, true, convex);

+*/

+                    mesh = _parent_scene.m_meshWorker.getMesh(this, _pbs, _size, m_shapetype);

                 }

                 else

                 {

@@ -1476,7 +1481,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             hasOOBoffsetFromMesh = false;

             m_NoColide = false;

 

-            if (_parent_scene.needsMeshing(_pbs))

+            if (_parent_scene.m_meshWorker.needsMeshing(_pbs))

             {

                 haveMesh = setMesh(_parent_scene); // this will give a mesh to non trivial known prims

                 if (!haveMesh)