diff options
| author | Robert Adams | 2015-07-21 20:11:59 -0700 |
|---|---|---|
| committer | Robert Adams | 2015-07-21 20:11:59 -0700 |
| commit | 8cc7433d68b67450fed58bbdb5b165b052811244 (patch) | |
| tree | 0dd56d5cf2706676dbfc0a5206cc3370fbaed06f /OpenSim | |
| parent | Prevent two maptiles being generated at startup, one for v1 and another for v... (diff) | |
| download | opensim-SC_OLD-8cc7433d68b67450fed58bbdb5b165b052811244.zip opensim-SC_OLD-8cc7433d68b67450fed58bbdb5b165b052811244.tar.gz opensim-SC_OLD-8cc7433d68b67450fed58bbdb5b165b052811244.tar.bz2 opensim-SC_OLD-8cc7433d68b67450fed58bbdb5b165b052811244.tar.xz | |
BulletSim: fix cut-and-paste typo in constraint frame setting.
This code is in the XNA module so it does not affect the normal
Bullet configuration .
Diffstat (limited to 'OpenSim')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs index f833d54..741f8db 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs | |||
| @@ -658,7 +658,7 @@ private sealed class BulletConstraintXNA : BulletConstraint | |||
| 658 | IndexedVector3 frame2v = new IndexedVector3(pframe2.X, pframe2.Y, pframe2.Z); | 658 | IndexedVector3 frame2v = new IndexedVector3(pframe2.X, pframe2.Y, pframe2.Z); |
| 659 | IndexedQuaternion frame2rot = new IndexedQuaternion(pframe2rot.X, pframe2rot.Y, pframe2rot.Z, pframe2rot.W); | 659 | IndexedQuaternion frame2rot = new IndexedQuaternion(pframe2rot.X, pframe2rot.Y, pframe2rot.Z, pframe2rot.W); |
| 660 | IndexedMatrix frame2 = IndexedMatrix.CreateFromQuaternion(frame2rot); | 660 | IndexedMatrix frame2 = IndexedMatrix.CreateFromQuaternion(frame2rot); |
| 661 | frame2._origin = frame1v; | 661 | frame2._origin = frame2v; |
| 662 | constraint.SetFrames(ref frame1, ref frame2); | 662 | constraint.SetFrames(ref frame1, ref frame2); |
| 663 | return true; | 663 | return true; |
| 664 | } | 664 | } |