1 files changed, 26 insertions, 27 deletions

diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
index 6bf5be1..fbc6134 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
@@ -57,7 +57,6 @@ using OdeAPI;
 using OpenSim.Framework;

 using OpenSim.Region.Physics.Manager;

 

-

 namespace OpenSim.Region.Physics.OdePlugin

 {

     public class OdePrim : PhysicsActor

@@ -538,24 +537,6 @@ namespace OpenSim.Region.Physics.OdePlugin
         {

             set

             {

-/*                

-                IMesh mesh = null;

-                if (_parent_scene.needsMeshing(value))

-                {

-                    bool convex;

-                    if (m_shapetype == 0)

-                        convex = false;

-                    else

-                        convex = true;

-                    mesh = _parent_scene.mesher.CreateMesh(Name, _pbs, _size, (int)LevelOfDetail.High, true, convex);

-                }

-

-                if (mesh != null)

-                {

-                    lock (m_meshlock)

-                        m_mesh = mesh;

-                }

-*/

                 AddChange(changes.Shape, value);

             }

         }

@@ -1092,18 +1073,21 @@ namespace OpenSim.Region.Physics.OdePlugin
             CalcPrimBodyData();

 

             m_mesh = null;

-            if (_parent_scene.needsMeshing(pbs))

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

             {

                 bool convex;

+                int clod = (int)LevelOfDetail.High;

                 if (m_shapetype == 0)

                     convex = false;

                 else

+                {

                     convex = true;

-

-                m_mesh = _parent_scene.mesher.CreateMesh(Name, _pbs, _size, (int)LevelOfDetail.High, true, convex);

+                    if (_pbs.SculptType != (byte)SculptType.Mesh)

+                        clod = (int)LevelOfDetail.Low;

+                }

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

             }

 

-

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

 

             AddChange(changes.Add, null);

@@ -1354,18 +1338,23 @@ namespace OpenSim.Region.Physics.OdePlugin
 

             IMesh mesh = null;

 

-

             lock (m_meshlock)

             {

                 if (m_mesh == null)

                 {

                     bool convex;

+                    int clod = (int)LevelOfDetail.High;

+

                     if (m_shapetype == 0)

                         convex = false;

                     else

+                    {

                         convex = true;

+                        if (_pbs.SculptType != (byte)SculptType.Mesh)

+                            clod = (int)LevelOfDetail.Low;

+                    }

 

-                    mesh = _parent_scene.mesher.CreateMesh(Name, _pbs, _size, (int)LevelOfDetail.High, true, convex);

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

                 }

                 else

                 {

@@ -1373,7 +1362,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                 }

 

                 if (mesh == null)

-                {

+                {                  

                     m_log.WarnFormat("[PHYSICS]: CreateMesh Failed on prim {0} at <{1},{2},{3}>.", Name, _position.X, _position.Y, _position.Z);

                     return false;

                 }

@@ -1394,7 +1383,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                 hasOOBoffsetFromMesh = true;

 

                 mesh.releaseSourceMeshData();

-                m_mesh = null;

+                m_mesh = mesh;

             }

 

             IntPtr geo = IntPtr.Zero;

@@ -1536,7 +1525,10 @@ namespace OpenSim.Region.Physics.OdePlugin
                         d.GeomTriMeshDataDestroy(_triMeshData);

                         _triMeshData = IntPtr.Zero;

                     }

+

                 }

+

+

                 //                catch (System.AccessViolationException)

                 catch (Exception e)

                 {

@@ -1550,6 +1542,13 @@ namespace OpenSim.Region.Physics.OdePlugin
             {

                 m_log.ErrorFormat("[PHYSICS]: PrimGeom destruction BAD {0}", Name);

             }

+

+            if (m_mesh != null)

+            {

+                _parent_scene.mesher.ReleaseMesh(m_mesh);

+                m_mesh = null;

+            }

+

             Body = IntPtr.Zero;

             hasOOBoffsetFromMesh = false;

         }