aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
diff options
context:
space:
mode:
authorMelanie2011-04-17 18:42:06 +0200
committerMelanie2011-04-17 18:42:06 +0200
commitc02e0e930d078ab5e2d4070df65c3d74f5812cbc (patch)
treeabb12e192cf0675b675d874eb86b65aa4fd177d7 /OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
parentFix the cert validation handler so that it will not block other parts of (diff)
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC-c02e0e930d078ab5e2d4070df65c3d74f5812cbc.zip
opensim-SC-c02e0e930d078ab5e2d4070df65c3d74f5812cbc.tar.gz
opensim-SC-c02e0e930d078ab5e2d4070df65c3d74f5812cbc.tar.bz2
opensim-SC-c02e0e930d078ab5e2d4070df65c3d74f5812cbc.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs')
-rw-r--r--OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
index 85e34c1..6df213d 100644
--- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
+++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
@@ -648,6 +648,9 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
648 if (pbs.ProfileHollow != 0) 648 if (pbs.ProfileHollow != 0)
649 iPropertiesNotSupportedDefault++; 649 iPropertiesNotSupportedDefault++;
650 650
651 if ((pbs.PathBegin != 0) || pbs.PathEnd != 0)
652 iPropertiesNotSupportedDefault++;
653
651 if ((pbs.PathTwistBegin != 0) || (pbs.PathTwist != 0)) 654 if ((pbs.PathTwistBegin != 0) || (pbs.PathTwist != 0))
652 iPropertiesNotSupportedDefault++; 655 iPropertiesNotSupportedDefault++;
653 656