* This update adds limited support for Cylinder meshed prim in the Meshmerizer plugin. (Limited because path cut is wrongly offset and while Hollowing works, you can walk through the inside wall.)

2 files changed, 15 insertions, 0 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 690e9d3..aa80a84 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -127,6 +127,18 @@ namespace OpenSim.Region.Physics.OdePlugin
                     m_targetSpace = _parent_scene.space;
             }
             m_primName = primName;
+            if (mesh != null)
+            {
+            }
+            else
+            {
+                if (_parent_scene.needsMeshing(_pbs))
+                {
+                    // Don't need to re-enable body..   it's done in SetMesh
+                    mesh = _parent_scene.mesher.CreateMesh(m_primName, _pbs, _size);
+                    // createmesh returns null when it's a shape that isn't a cube.
+                }
+            }
 
             lock (OdeScene.OdeLock)
             {
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 9cf6d50..37b8fb9 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1011,6 +1011,9 @@ namespace OpenSim.Region.Physics.OdePlugin
             if ((pbs.ProfileBegin != 0) || pbs.ProfileEnd != 0)
                 return true;
 
+            if (pbs.ProfileShape == ProfileShape.Circle && pbs.PathCurve == (byte)Extrusion.Straight)
+                return true;
+
             return false;
         }