diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs')
-rwxr-xr-x | OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs | 6 |
1 files changed, 3 insertions, 3 deletions
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 | |||
317 | 317 | ||
318 | public virtual bool ForceBodyShapeRebuild(bool inTaintTime) { return false; } | 318 | public virtual bool ForceBodyShapeRebuild(bool inTaintTime) { return false; } |
319 | 319 | ||
320 | public override bool PIDActive | 320 | public override bool PIDActive |
321 | { | 321 | { |
322 | get { return MoveToTargetActive; } | 322 | get { return MoveToTargetActive; } |
323 | set { MoveToTargetActive = value; } | 323 | set { MoveToTargetActive = value; } |
324 | } | 324 | } |
325 | 325 | ||
326 | public override OMV.Vector3 PIDTarget { set { MoveToTargetTarget = value; } } | 326 | public override OMV.Vector3 PIDTarget { set { MoveToTargetTarget = value; } } |
@@ -572,7 +572,7 @@ public abstract class BSPhysObject : PhysicsActor | |||
572 | newContact.RelativeSpeed = -OMV.Vector3.Dot(relvel, contactNormal); | 572 | newContact.RelativeSpeed = -OMV.Vector3.Dot(relvel, contactNormal); |
573 | // DetailLog("{0},{1}.Collision.AddCollider,vel={2},contee.vel={3},relvel={4},relspeed={5}", | 573 | // DetailLog("{0},{1}.Collision.AddCollider,vel={2},contee.vel={3},relvel={4},relspeed={5}", |
574 | // LocalID, TypeName, RawVelocity, (collidee == null ? OMV.Vector3.Zero : collidee.RawVelocity), relvel, newContact.RelativeSpeed); | 574 | // LocalID, TypeName, RawVelocity, (collidee == null ? OMV.Vector3.Zero : collidee.RawVelocity), relvel, newContact.RelativeSpeed); |
575 | 575 | ||
576 | lock (PhysScene.CollisionLock) | 576 | lock (PhysScene.CollisionLock) |
577 | { | 577 | { |
578 | CollisionCollection.AddCollider(collideeLocalID, newContact); | 578 | CollisionCollection.AddCollider(collideeLocalID, newContact); |