diff options
| author | Melanie | 2013-04-30 23:45:38 +0100 |
|---|---|---|
| committer | Melanie | 2013-04-30 23:45:38 +0100 |
| commit | b89d18e6f4a1099fe031ebf10776a752826604b9 (patch) | |
| tree | b964e6b167e156dc2adeddeb733d93eac342e9c0 /OpenSim/Region/Physics | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: fix error messages created while an avatar has no initial (diff) | |
| download | opensim-SC-b89d18e6f4a1099fe031ebf10776a752826604b9.zip opensim-SC-b89d18e6f4a1099fe031ebf10776a752826604b9.tar.gz opensim-SC-b89d18e6f4a1099fe031ebf10776a752826604b9.tar.bz2 opensim-SC-b89d18e6f4a1099fe031ebf10776a752826604b9.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to '')
| -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 309d004..f047176 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; |