* Adds Top Shear support to the Meshmerizer for the Cube prim and the Cylinder prim.

2 files changed, 8 insertions, 0 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 52a975e..d171947 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -389,7 +389,12 @@ namespace OpenSim.Region.Physics.OdePlugin
             {
                 disableBody();
             }
+
+            // This sleeper is there to moderate how long it takes between 
+            // setting up the mesh and pre-processing it when we get rapid fire mesh requests on a single object
             System.Threading.Thread.Sleep(10);
+            
+            
             float[] vertexList = mesh.getVertexListAsFloatLocked(); // Note, that vertextList is pinned in memory
             int[] indexList = mesh.getIndexListAsIntLocked(); // Also pinned, needs release after usage
             int VertexCount = vertexList.GetLength(0)/3;
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 0ee8eb5..2b3d186 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1014,6 +1014,9 @@ namespace OpenSim.Region.Physics.OdePlugin
             if ((pbs.PathScaleX != 100) || (pbs.PathScaleY != 100))
                 return true;
 
+            if ((pbs.PathShearX != 0) || (pbs.PathShearY != 0))
+                return true;
+
             if (pbs.ProfileShape == ProfileShape.Circle && pbs.PathCurve == (byte)Extrusion.Straight)
                 return true;