diff options
| author | Robert Adams | 2012-12-27 18:19:25 -0800 |
|---|---|---|
| committer | Robert Adams | 2012-12-27 22:12:28 -0800 |
| commit | c1e7539c77480b839d513dbb7db74aa8f260eba0 (patch) | |
| tree | c67c637a678b0ec432438eb56a66481a258eab19 /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |
| parent | BulletSim: move logic for IsColliding, CollidingGround and CollidingObj from ... (diff) | |
| download | opensim-SC_OLD-c1e7539c77480b839d513dbb7db74aa8f260eba0.zip opensim-SC_OLD-c1e7539c77480b839d513dbb7db74aa8f260eba0.tar.gz opensim-SC_OLD-c1e7539c77480b839d513dbb7db74aa8f260eba0.tar.bz2 opensim-SC_OLD-c1e7539c77480b839d513dbb7db74aa8f260eba0.tar.xz | |
BulletSim: Parameterize nominal frame rate (55) and add parameters to dynamially turn on/off detailed, unmanaged data dumping of prims and vehicles.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs index 06e4ada..2d429c4 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |||
| @@ -758,8 +758,8 @@ public sealed class BSPrim : BSPhysObject | |||
| 758 | // For compound based linksets, this enables and disables interactions of the children. | 758 | // For compound based linksets, this enables and disables interactions of the children. |
| 759 | Linkset.Refresh(this); | 759 | Linkset.Refresh(this); |
| 760 | 760 | ||
| 761 | DetailLog("{0},BSPrim.UpdatePhysicalParameters,taintExit,static={1},solid={2},mass={3},collide={4},cf={5:X},body={6},shape={7}", | 761 | DetailLog("{0},BSPrim.UpdatePhysicalParameters,taintExit,static={1},solid={2},mass={3},collide={4},cf={5:X},cType={6},body={7},shape={8}", |
| 762 | LocalID, IsStatic, IsSolid, Mass, SubscribedEvents(), CurrentCollisionFlags, PhysBody, PhysShape); | 762 | LocalID, IsStatic, IsSolid, Mass, SubscribedEvents(), CurrentCollisionFlags, PhysBody.collisionType, PhysBody, PhysShape); |
| 763 | } | 763 | } |
| 764 | 764 | ||
| 765 | // "Making dynamic" means changing to and from static. | 765 | // "Making dynamic" means changing to and from static. |