From 50acb8e634cfb85c6e6c76e72b99bea459bfe746 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Fri, 8 Feb 2008 11:32:56 +0000
Subject: * 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.)

---
 OpenSim/Region/Physics/OdePlugin/ODEPrim.cs   | 12 ++++++++++++
 OpenSim/Region/Physics/OdePlugin/OdePlugin.cs |  3 +++
 2 files changed, 15 insertions(+)

(limited to 'OpenSim/Region/Physics/OdePlugin')

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;
         }
 
-- 
cgit v1.1