diff options
| author | Robert Adams | 2013-05-01 12:08:12 -0700 |
|---|---|---|
| committer | Robert Adams | 2013-05-01 12:08:12 -0700 |
| commit | fca4e4ec7c044921ba602862c5a42900f819015a (patch) | |
| tree | f3a1e0b09b7a454009437dd9b1015891a85eadb8 /OpenSim/Region/Physics | |
| parent | BulletSim: improvements to LinksetCompound and PrimDisplaced. Not all working... (diff) | |
| parent | Add in-code exaplanation for the change in cancellation signalling in STP 2.2... (diff) | |
| download | opensim-SC_OLD-fca4e4ec7c044921ba602862c5a42900f819015a.zip opensim-SC_OLD-fca4e4ec7c044921ba602862c5a42900f819015a.tar.gz opensim-SC_OLD-fca4e4ec7c044921ba602862c5a42900f819015a.tar.bz2 opensim-SC_OLD-fca4e4ec7c044921ba602862c5a42900f819015a.tar.xz | |
Merge branch 'master' into bulletsim4
Diffstat (limited to 'OpenSim/Region/Physics')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs index 7eba851..e796804 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
| @@ -97,6 +97,9 @@ public abstract class BSPhysObject : PhysicsActor | |||
| 97 | 97 | ||
| 98 | CollisionCollection = new CollisionEventUpdate(); | 98 | CollisionCollection = new CollisionEventUpdate(); |
| 99 | CollisionsLastReported = CollisionCollection; | 99 | CollisionsLastReported = CollisionCollection; |
| 100 | CollisionsLastTick = new CollisionEventUpdate(); | ||
| 101 | CollisionsLastTickStep = -1; | ||
| 102 | |||
| 100 | SubscribedEventsMs = 0; | 103 | SubscribedEventsMs = 0; |
| 101 | CollidingStep = 0; | 104 | CollidingStep = 0; |
| 102 | CollidingGroundStep = 0; | 105 | CollidingGroundStep = 0; |