ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into bulletsim4

Browse Source
This commit is contained in:
Robert Adams
2013-05-01 12:08:12 -07:00
parent 7cdb07b386 81a90e30c6
commit fca4e4ec7c
45 changed files with 7291 additions and 4926 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
View File

@@ -97,6 +97,9 @@ public abstract class BSPhysObject : PhysicsActor
CollisionCollection = new CollisionEventUpdate();
CollisionsLastReported = CollisionCollection;
CollisionsLastTick = new CollisionEventUpdate();
CollisionsLastTickStep = -1;
SubscribedEventsMs = 0;
CollidingStep = 0;
CollidingGroundStep = 0;