From b16abc8166c29585cb76cc55c3bdd76e5833cb4f Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Thu, 5 Jan 2017 19:07:37 +0000 Subject: Massive tab and trailing space cleanup --- OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs') diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs index a846869..6aa24d5 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs @@ -317,10 +317,10 @@ public abstract class BSPhysObject : PhysicsActor public virtual bool ForceBodyShapeRebuild(bool inTaintTime) { return false; } - public override bool PIDActive + public override bool PIDActive { get { return MoveToTargetActive; } - set { MoveToTargetActive = value; } + set { MoveToTargetActive = value; } } public override OMV.Vector3 PIDTarget { set { MoveToTargetTarget = value; } } @@ -572,7 +572,7 @@ public abstract class BSPhysObject : PhysicsActor newContact.RelativeSpeed = -OMV.Vector3.Dot(relvel, contactNormal); // DetailLog("{0},{1}.Collision.AddCollider,vel={2},contee.vel={3},relvel={4},relspeed={5}", // LocalID, TypeName, RawVelocity, (collidee == null ? OMV.Vector3.Zero : collidee.RawVelocity), relvel, newContact.RelativeSpeed); - + lock (PhysScene.CollisionLock) { CollisionCollection.AddCollider(collideeLocalID, newContact); -- cgit v1.1