diff options
author | Robert Adams | 2013-04-29 07:54:50 -0700 |
---|---|---|
committer | Robert Adams | 2013-04-29 07:54:50 -0700 |
commit | 92ee288d666963aae2a058cc964be009a504f084 (patch) | |
tree | 8c18c28f2ca757c6883c4c5d3b82e06d47962ee2 /OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |
parent | BulletSim: rename variable 'PhysicsScene' to be either 'PhysScene' or 'm_phys... (diff) | |
download | opensim-SC_OLD-92ee288d666963aae2a058cc964be009a504f084.zip opensim-SC_OLD-92ee288d666963aae2a058cc964be009a504f084.tar.gz opensim-SC_OLD-92ee288d666963aae2a058cc964be009a504f084.tar.bz2 opensim-SC_OLD-92ee288d666963aae2a058cc964be009a504f084.tar.xz |
BulletSim: remove trailing white space to make git happier. No functional changes.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs index e12fc8e..542f732 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |||
@@ -371,7 +371,7 @@ public sealed class BSCharacter : BSPhysObject | |||
371 | public override float Mass { get { return _mass; } } | 371 | public override float Mass { get { return _mass; } } |
372 | 372 | ||
373 | // used when we only want this prim's mass and not the linkset thing | 373 | // used when we only want this prim's mass and not the linkset thing |
374 | public override float RawMass { | 374 | public override float RawMass { |
375 | get {return _mass; } | 375 | get {return _mass; } |
376 | } | 376 | } |
377 | public override void UpdatePhysicalMassProperties(float physMass, bool inWorld) | 377 | public override void UpdatePhysicalMassProperties(float physMass, bool inWorld) |
@@ -586,7 +586,7 @@ public sealed class BSCharacter : BSPhysObject | |||
586 | } | 586 | } |
587 | public override float ForceBuoyancy { | 587 | public override float ForceBuoyancy { |
588 | get { return _buoyancy; } | 588 | get { return _buoyancy; } |
589 | set { | 589 | set { |
590 | PhysScene.AssertInTaintTime("BSCharacter.ForceBuoyancy"); | 590 | PhysScene.AssertInTaintTime("BSCharacter.ForceBuoyancy"); |
591 | 591 | ||
592 | _buoyancy = value; | 592 | _buoyancy = value; |
@@ -647,7 +647,7 @@ public sealed class BSCharacter : BSPhysObject | |||
647 | private OMV.Vector3 ComputeAvatarScale(OMV.Vector3 size) | 647 | private OMV.Vector3 ComputeAvatarScale(OMV.Vector3 size) |
648 | { | 648 | { |
649 | OMV.Vector3 newScale; | 649 | OMV.Vector3 newScale; |
650 | 650 | ||
651 | // Bullet's capsule total height is the "passed height + radius * 2"; | 651 | // Bullet's capsule total height is the "passed height + radius * 2"; |
652 | // The base capsule is 1 diameter and 2 height (passed radius=0.5, passed height = 1) | 652 | // The base capsule is 1 diameter and 2 height (passed radius=0.5, passed height = 1) |
653 | // The number we pass in for 'scaling' is the multiplier to get that base | 653 | // The number we pass in for 'scaling' is the multiplier to get that base |