diff options
| author | Robert Adams | 2012-09-27 09:31:33 -0700 |
|---|---|---|
| committer | Robert Adams | 2012-09-27 22:02:03 -0700 |
| commit | 7b65985047bdf0789fe3eccf8f515279f362abf1 (patch) | |
| tree | e29509c2e8fc094d50dda62d841dbaa9cf91cfeb /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |
| parent | BulletSim: remove the unused body management code from BSPrim. There is no go... (diff) | |
| download | opensim-SC-7b65985047bdf0789fe3eccf8f515279f362abf1.zip opensim-SC-7b65985047bdf0789fe3eccf8f515279f362abf1.tar.gz opensim-SC-7b65985047bdf0789fe3eccf8f515279f362abf1.tar.bz2 opensim-SC-7b65985047bdf0789fe3eccf8f515279f362abf1.tar.xz | |
BulletSim: remove the trailing spaces from lines to make git happier
Diffstat (limited to '')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs index df95625..d9b738b 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
| @@ -100,7 +100,7 @@ public abstract class BSPhysObject : PhysicsActor | |||
| 100 | // The simulation step is telling this object about a collision. | 100 | // The simulation step is telling this object about a collision. |
| 101 | // Return 'true' if a collision was processed and should be sent up. | 101 | // Return 'true' if a collision was processed and should be sent up. |
| 102 | // Called at taint time from within the Step() function | 102 | // Called at taint time from within the Step() function |
| 103 | public virtual bool Collide(uint collidingWith, BSPhysObject collidee, | 103 | public virtual bool Collide(uint collidingWith, BSPhysObject collidee, |
| 104 | OMV.Vector3 contactPoint, OMV.Vector3 contactNormal, float pentrationDepth) | 104 | OMV.Vector3 contactPoint, OMV.Vector3 contactNormal, float pentrationDepth) |
| 105 | { | 105 | { |
| 106 | bool ret = false; | 106 | bool ret = false; |