aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-10-13 01:05:28 +0100
committerJustin Clark-Casey (justincc)2012-10-13 01:05:28 +0100
commit946c2e7e7c52f54cb47665e118622e7dc5e774c5 (patch)
tree2ea7b82995b6c3cbf7be69a69055f5201cd730c9 /OpenSim/Region
parentImprove on TBG Renfold's fix to llRequestSimulatorData DATA_SIM_POS by only p... (diff)
parentBulletSim: only use native sphere shape if it is a sphere. (diff)
downloadopensim-SC_OLD-946c2e7e7c52f54cb47665e118622e7dc5e774c5.zip
opensim-SC_OLD-946c2e7e7c52f54cb47665e118622e7dc5e774c5.tar.gz
opensim-SC_OLD-946c2e7e7c52f54cb47665e118622e7dc5e774c5.tar.bz2
opensim-SC_OLD-946c2e7e7c52f54cb47665e118622e7dc5e774c5.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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