From 232aa783adc6449425c627666c472b98b77081b8 Mon Sep 17 00:00:00 2001 From: Dahlia Trimble Date: Mon, 22 Sep 2008 02:33:48 +0000 Subject: [PATCH] Disabled use of ODE internal geometry to see if it affects the "waves finger" error --- OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index f811766a06..5aeae9213b 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs @@ -1527,18 +1527,18 @@ namespace OpenSim.Region.Physics.OdePlugin } // 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 ((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)) - { - if (pbs.ProfileBegin == 0 && pbs.ProfileEnd == 0 - && pbs.ProfileHollow == 0 - && pbs.PathTwist == 0 && pbs.PathTwistBegin == 0 - && pbs.PathBegin == 0 && pbs.PathEnd == 0 - //&& pbs.PathTaperX == 0 && pbs.PathTaperY == 0 - && pbs.PathScaleX == 100 && pbs.PathScaleY == 100) - return false; - } + //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)) + //{ + // if (pbs.ProfileBegin == 0 && pbs.ProfileEnd == 0 + // && pbs.ProfileHollow == 0 + // && pbs.PathTwist == 0 && pbs.PathTwistBegin == 0 + // && pbs.PathBegin == 0 && pbs.PathEnd == 0 + // //&& pbs.PathTaperX == 0 && pbs.PathTaperY == 0 + // && pbs.PathScaleX == 100 && pbs.PathScaleY == 100) + // return false; + //} // if (pbs.ProfileHollow != 0) // return true;