diff options
author | Robert Adams | 2013-03-17 18:44:09 -0700 |
---|---|---|
committer | Robert Adams | 2013-03-19 00:00:02 -0700 |
commit | 8510f57ad48db5f97dacc2a9be63c64e62477d14 (patch) | |
tree | c43402d78fa9edfc0e440a600bfdf0745d6a2f06 /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |
parent | Process default attachment point in AttachObjectInternal before we check whet... (diff) | |
download | opensim-SC_OLD-8510f57ad48db5f97dacc2a9be63c64e62477d14.zip opensim-SC_OLD-8510f57ad48db5f97dacc2a9be63c64e62477d14.tar.gz opensim-SC_OLD-8510f57ad48db5f97dacc2a9be63c64e62477d14.tar.bz2 opensim-SC_OLD-8510f57ad48db5f97dacc2a9be63c64e62477d14.tar.xz |
BulletSim: add terrain contact processing threshold parameter. Initialize contact processing threshold for static object as well as mesh terrain.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs index a465613..2cbbe9a 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |||
@@ -947,9 +947,9 @@ public class BSPrim : BSPhysObject | |||
947 | ZeroMotion(true); | 947 | ZeroMotion(true); |
948 | 948 | ||
949 | // Set various physical properties so other object interact properly | 949 | // Set various physical properties so other object interact properly |
950 | MaterialAttributes matAttrib = BSMaterials.GetAttributes(Material, false); | ||
951 | PhysicsScene.PE.SetFriction(PhysBody, Friction); | 950 | PhysicsScene.PE.SetFriction(PhysBody, Friction); |
952 | PhysicsScene.PE.SetRestitution(PhysBody, Restitution); | 951 | PhysicsScene.PE.SetRestitution(PhysBody, Restitution); |
952 | PhysicsScene.PE.SetContactProcessingThreshold(PhysBody, BSParam.ContactProcessingThreshold); | ||
953 | 953 | ||
954 | // Mass is zero which disables a bunch of physics stuff in Bullet | 954 | // Mass is zero which disables a bunch of physics stuff in Bullet |
955 | UpdatePhysicalMassProperties(0f, false); | 955 | UpdatePhysicalMassProperties(0f, false); |