aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorRobert Adams2012-10-12 07:37:52 -0700
committerRobert Adams2012-10-12 07:41:31 -0700
commit8c40215834bc1286a6bd2902e1c8b0f2ef793fd7 (patch)
treec16ee95d54e512c578ba0f033347a242e97d5925 /OpenSim/Region
parentGet rid of accidental scene start left in ScenePresenceAutopilotTests (diff)
downloadopensim-SC_OLD-8c40215834bc1286a6bd2902e1c8b0f2ef793fd7.zip
opensim-SC_OLD-8c40215834bc1286a6bd2902e1c8b0f2ef793fd7.tar.gz
opensim-SC_OLD-8c40215834bc1286a6bd2902e1c8b0f2ef793fd7.tar.bz2
opensim-SC_OLD-8c40215834bc1286a6bd2902e1c8b0f2ef793fd7.tar.xz
BulletSim: only use native sphere shape if it is a sphere.
Diffstat (limited to 'OpenSim/Region')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index a0d111a..d189f1d 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -373,7 +373,8 @@ public class BSShapeCollection : IDisposable
373 && pbs.PathScaleX == 100 && pbs.PathScaleY == 100 373 && pbs.PathScaleX == 100 && pbs.PathScaleY == 100
374 && pbs.PathShearX == 0 && pbs.PathShearY == 0) ) ) 374 && pbs.PathShearX == 0 && pbs.PathShearY == 0) ) )
375 { 375 {
376 if (pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte)Extrusion.Curve1) 376 if ((pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte)Extrusion.Curve1)
377 && pbs.Scale.X == pbs.Scale.Y && pbs.Scale.Y == pbs.Scale.Z)
377 { 378 {
378 haveShape = true; 379 haveShape = true;
379 if (forceRebuild 380 if (forceRebuild