diff options
| author | UbitUmarov | 2016-07-27 23:39:50 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-07-27 23:39:50 +0100 |
| commit | 376084a2e52561cfd1b359aabe9bb64ecc84c2fc (patch) | |
| tree | 77052f68f03eb426b35fc7bd584eeadf9a4b34cf /OpenSim/Region/PhysicsModules/BulletS | |
| parent | add another gatekeeper login fail reason reply (diff) | |
| parent | first step removing MegaRegions: refuse to run. Thanks to all that made MegaR... (diff) | |
| download | opensim-SC-376084a2e52561cfd1b359aabe9bb64ecc84c2fc.zip opensim-SC-376084a2e52561cfd1b359aabe9bb64ecc84c2fc.tar.gz opensim-SC-376084a2e52561cfd1b359aabe9bb64ecc84c2fc.tar.bz2 opensim-SC-376084a2e52561cfd1b359aabe9bb64ecc84c2fc.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/PhysicsModules/BulletS')
| -rwxr-xr-x | OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs index a70d1b8..bb21f0c 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs | |||
| @@ -508,7 +508,7 @@ public abstract class BSPhysObject : PhysicsActor | |||
| 508 | relvel = RawVelocity; | 508 | relvel = RawVelocity; |
| 509 | if (collidee != null && collidee.IsPhysical) | 509 | if (collidee != null && collidee.IsPhysical) |
| 510 | relvel -= collidee.RawVelocity; | 510 | relvel -= collidee.RawVelocity; |
| 511 | newContact.RelativeSpeed = OMV.Vector3.Dot(relvel, contactNormal); | 511 | newContact.RelativeSpeed = -OMV.Vector3.Dot(relvel, contactNormal); |
| 512 | // DetailLog("{0},{1}.Collision.AddCollider,vel={2},contee.vel={3},relvel={4},relspeed={5}", | 512 | // DetailLog("{0},{1}.Collision.AddCollider,vel={2},contee.vel={3},relvel={4},relspeed={5}", |
| 513 | // LocalID, TypeName, RawVelocity, (collidee == null ? OMV.Vector3.Zero : collidee.RawVelocity), relvel, newContact.RelativeSpeed); | 513 | // LocalID, TypeName, RawVelocity, (collidee == null ? OMV.Vector3.Zero : collidee.RawVelocity), relvel, newContact.RelativeSpeed); |
| 514 | 514 | ||