From 2537a4098a3df5fbde726a3817c85c67013d090b Mon Sep 17 00:00:00 2001
From: Dahlia Trimble
Date: Thu, 18 Dec 2008 17:53:38 +0000
Subject: Enabled complex meshing for simple box prims with non-zero shear

---
 OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index d1a3ce7..7589750 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1691,7 +1691,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                 return false;
             }
 
-            // if it's a standard box or sphere with no cuts or hollows or twist, return false since ODE can use an internal representation for the prim
+            // if it's a standard box or sphere with no cuts, hollows, twist or top shear, return false since ODE can use an internal representation for the prim
             if ((pbs.ProfileShape == ProfileShape.Square && pbs.PathCurve == (byte)Extrusion.Straight)
                 || (pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte)Extrusion.Curve1
                 && pbs.Scale.X == pbs.Scale.Y && pbs.Scale.Y == pbs.Scale.Z))
@@ -1702,7 +1702,8 @@ namespace OpenSim.Region.Physics.OdePlugin
                     && pbs.PathTwist == 0 && pbs.PathTwistBegin == 0
                     && pbs.PathBegin == 0 && pbs.PathEnd == 0
                     && pbs.PathTaperX == 0 && pbs.PathTaperY == 0
-                    && pbs.PathScaleX == 100 && pbs.PathScaleY == 100)
+                    && pbs.PathScaleX == 100 && pbs.PathScaleY == 100
+                    && pbs.PathShearX == 0 && pbs.PathShearY == 0)
                 {
 #if SPAM
                     m_log.Warn("NonMesh");
-- 
cgit v1.1