aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDahlia Trimble2008-09-22 02:33:48 +0000
committerDahlia Trimble2008-09-22 02:33:48 +0000
commit232aa783adc6449425c627666c472b98b77081b8 (patch)
tree72609e2a51681af763ff2316af334166af5b8108 /OpenSim/Region
parentPrevent scripts from running under multiple engines at once (diff)
downloadopensim-SC_OLD-232aa783adc6449425c627666c472b98b77081b8.zip
opensim-SC_OLD-232aa783adc6449425c627666c472b98b77081b8.tar.gz
opensim-SC_OLD-232aa783adc6449425c627666c472b98b77081b8.tar.bz2
opensim-SC_OLD-232aa783adc6449425c627666c472b98b77081b8.tar.xz
Disabled use of ODE internal geometry to see if it affects the "waves finger" error
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs24
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index f811766..5aeae92 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1527,18 +1527,18 @@ namespace OpenSim.Region.Physics.OdePlugin
1527 } 1527 }
1528 1528
1529 // 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 1529 // 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
1530 if ((pbs.ProfileShape == ProfileShape.Square && pbs.PathCurve == (byte)Extrusion.Straight) 1530 //if ((pbs.ProfileShape == ProfileShape.Square && pbs.PathCurve == (byte)Extrusion.Straight)
1531 || (pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte)Extrusion.Curve1 1531 // || (pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte)Extrusion.Curve1
1532 && pbs.Scale.X == pbs.Scale.Y && pbs.Scale.Y == pbs.Scale.Z)) 1532 // && pbs.Scale.X == pbs.Scale.Y && pbs.Scale.Y == pbs.Scale.Z))
1533 { 1533 //{
1534 if (pbs.ProfileBegin == 0 && pbs.ProfileEnd == 0 1534 // if (pbs.ProfileBegin == 0 && pbs.ProfileEnd == 0
1535 && pbs.ProfileHollow == 0 1535 // && pbs.ProfileHollow == 0
1536 && pbs.PathTwist == 0 && pbs.PathTwistBegin == 0 1536 // && pbs.PathTwist == 0 && pbs.PathTwistBegin == 0
1537 && pbs.PathBegin == 0 && pbs.PathEnd == 0 1537 // && pbs.PathBegin == 0 && pbs.PathEnd == 0
1538 //&& pbs.PathTaperX == 0 && pbs.PathTaperY == 0 1538 // //&& pbs.PathTaperX == 0 && pbs.PathTaperY == 0
1539 && pbs.PathScaleX == 100 && pbs.PathScaleY == 100) 1539 // && pbs.PathScaleX == 100 && pbs.PathScaleY == 100)
1540 return false; 1540 // return false;
1541 } 1541 //}
1542 1542
1543 // if (pbs.ProfileHollow != 0) 1543 // if (pbs.ProfileHollow != 0)
1544 // return true; 1544 // return true;