diff options
author | Robert Adams | 2019-02-05 08:07:22 -0800 |
---|---|---|
committer | Robert Adams | 2019-02-05 08:07:22 -0800 |
commit | a1568697d0240d0b553b1ec2ca7c573f5382d318 (patch) | |
tree | 120d8cffadd701719bdf659b45cb1f227f705e2d /OpenSim/Region | |
parent | allow more suicidal NonPhysicalPrimMax (diff) | |
download | opensim-SC-a1568697d0240d0b553b1ec2ca7c573f5382d318.zip opensim-SC-a1568697d0240d0b553b1ec2ca7c573f5382d318.tar.gz opensim-SC-a1568697d0240d0b553b1ec2ca7c573f5382d318.tar.bz2 opensim-SC-a1568697d0240d0b553b1ec2ca7c573f5382d318.tar.xz |
Remove cut-and-paste typo in 6dof contstrain setup in XNA version of
BulletSim. Could only effect operation of flexible linksets when using
the C# version of the Bullet physics engine.
Found by Tampa and reported in Mantis 7612.
Diffstat (limited to 'OpenSim/Region')
-rwxr-xr-x | OpenSim/Region/PhysicsModules/BulletS/BSAPIXNA.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSAPIXNA.cs b/OpenSim/Region/PhysicsModules/BulletS/BSAPIXNA.cs index 7d58728..56a666a 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSAPIXNA.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSAPIXNA.cs | |||
@@ -588,7 +588,7 @@ private sealed class BulletConstraintXNA : BulletConstraint | |||
588 | IndexedVector3 frame2v = new IndexedVector3(pframe2.X, pframe2.Y, pframe2.Z); | 588 | IndexedVector3 frame2v = new IndexedVector3(pframe2.X, pframe2.Y, pframe2.Z); |
589 | IndexedQuaternion frame2rot = new IndexedQuaternion(pframe2rot.X, pframe2rot.Y, pframe2rot.Z, pframe2rot.W); | 589 | IndexedQuaternion frame2rot = new IndexedQuaternion(pframe2rot.X, pframe2rot.Y, pframe2rot.Z, pframe2rot.W); |
590 | IndexedMatrix frame2 = IndexedMatrix.CreateFromQuaternion(frame2rot); | 590 | IndexedMatrix frame2 = IndexedMatrix.CreateFromQuaternion(frame2rot); |
591 | frame2._origin = frame1v; | 591 | frame2._origin = frame2v; |
592 | 592 | ||
593 | Generic6DofConstraint consttr = new Generic6DofConstraint(body1, body2, ref frame1, ref frame2, | 593 | Generic6DofConstraint consttr = new Generic6DofConstraint(body1, body2, ref frame1, ref frame2, |
594 | puseLinearReferenceFrameA); | 594 | puseLinearReferenceFrameA); |