diff options
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs index 9dc52d5..2efb1a5 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
@@ -121,7 +121,7 @@ public abstract class BSPhysObject : PhysicsActor | |||
121 | public virtual void Destroy() | 121 | public virtual void Destroy() |
122 | { | 122 | { |
123 | PhysicalActors.Enable(false); | 123 | PhysicalActors.Enable(false); |
124 | PhysScene.TaintedObject("BSPhysObject.Destroy", delegate() | 124 | PhysScene.TaintedObject(LocalID, "BSPhysObject.Destroy", delegate() |
125 | { | 125 | { |
126 | PhysicalActors.Dispose(); | 126 | PhysicalActors.Dispose(); |
127 | }); | 127 | }); |
@@ -509,7 +509,7 @@ public abstract class BSPhysObject : PhysicsActor | |||
509 | // make sure first collision happens | 509 | // make sure first collision happens |
510 | NextCollisionOkTime = Util.EnvironmentTickCountSubtract(SubscribedEventsMs); | 510 | NextCollisionOkTime = Util.EnvironmentTickCountSubtract(SubscribedEventsMs); |
511 | 511 | ||
512 | PhysScene.TaintedObject(TypeName+".SubscribeEvents", delegate() | 512 | PhysScene.TaintedObject(LocalID, TypeName+".SubscribeEvents", delegate() |
513 | { | 513 | { |
514 | if (PhysBody.HasPhysicalBody) | 514 | if (PhysBody.HasPhysicalBody) |
515 | CurrentCollisionFlags = PhysScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS); | 515 | CurrentCollisionFlags = PhysScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS); |
@@ -524,7 +524,7 @@ public abstract class BSPhysObject : PhysicsActor | |||
524 | public override void UnSubscribeEvents() { | 524 | public override void UnSubscribeEvents() { |
525 | // DetailLog("{0},{1}.UnSubscribeEvents,unsubscribing", LocalID, TypeName); | 525 | // DetailLog("{0},{1}.UnSubscribeEvents,unsubscribing", LocalID, TypeName); |
526 | SubscribedEventsMs = 0; | 526 | SubscribedEventsMs = 0; |
527 | PhysScene.TaintedObject(TypeName+".UnSubscribeEvents", delegate() | 527 | PhysScene.TaintedObject(LocalID, TypeName+".UnSubscribeEvents", delegate() |
528 | { | 528 | { |
529 | // Make sure there is a body there because sometimes destruction happens in an un-ideal order. | 529 | // Make sure there is a body there because sometimes destruction happens in an un-ideal order. |
530 | if (PhysBody.HasPhysicalBody) | 530 | if (PhysBody.HasPhysicalBody) |