diff options
| author | Dahlia Trimble | 2008-09-21 08:12:52 +0000 |
|---|---|---|
| committer | Dahlia Trimble | 2008-09-21 08:12:52 +0000 |
| commit | 52af9b3fd7b590ec83d99a70ab133c12aef3cf7b (patch) | |
| tree | 745a52c698ea055e3096ddfd60b1f33d60a84816 /OpenSim | |
| parent | Change XEngine startup to enable it to run as a normal region module (diff) | |
| download | opensim-SC-52af9b3fd7b590ec83d99a70ab133c12aef3cf7b.zip opensim-SC-52af9b3fd7b590ec83d99a70ab133c12aef3cf7b.tar.gz opensim-SC-52af9b3fd7b590ec83d99a70ab133c12aef3cf7b.tar.bz2 opensim-SC-52af9b3fd7b590ec83d99a70ab133c12aef3cf7b.tar.xz | |
ODE was using a box collision shape for some spheres - changed those cases to now use a mesh instead.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 5212c29..f811766 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
| @@ -1527,8 +1527,9 @@ 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.HalfCircle && pbs.PathCurve == (byte)Extrusion.Curve1) | 1530 | if ((pbs.ProfileShape == ProfileShape.Square && pbs.PathCurve == (byte)Extrusion.Straight) |
| 1531 | || (pbs.ProfileShape == ProfileShape.Square && pbs.PathCurve == (byte)Extrusion.Straight)) | 1531 | || (pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte)Extrusion.Curve1 |
| 1532 | && pbs.Scale.X == pbs.Scale.Y && pbs.Scale.Y == pbs.Scale.Z)) | ||
| 1532 | { | 1533 | { |
| 1533 | if (pbs.ProfileBegin == 0 && pbs.ProfileEnd == 0 | 1534 | if (pbs.ProfileBegin == 0 && pbs.ProfileEnd == 0 |
| 1534 | && pbs.ProfileHollow == 0 | 1535 | && pbs.ProfileHollow == 0 |