diff options
author | Justin Clark-Casey (justincc) | 2010-02-04 22:22:18 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-02-04 22:22:18 +0000 |
commit | 16467f6654b22da0b660a1184e56485c01fc37e7 (patch) | |
tree | 1c1ba78c60f98f059722090a3663313bf0be1072 /OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |
parent | minor: one method doc (diff) | |
parent | Applying patch #4534 by Misterblue to fix ODE physics stickiness (diff) | |
download | opensim-SC_OLD-16467f6654b22da0b660a1184e56485c01fc37e7.zip opensim-SC_OLD-16467f6654b22da0b660a1184e56485c01fc37e7.tar.gz opensim-SC_OLD-16467f6654b22da0b660a1184e56485c01fc37e7.tar.bz2 opensim-SC_OLD-16467f6654b22da0b660a1184e56485c01fc37e7.tar.xz |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODEPrim.cs')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 973aa84..44b2727 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -1575,6 +1575,7 @@ Console.WriteLine(" JointCreateFixed"); | |||
1575 | { | 1575 | { |
1576 | //Console.WriteLine("Move " + m_primName); | 1576 | //Console.WriteLine("Move " + m_primName); |
1577 | if (!d.BodyIsEnabled (Body)) d.BodyEnable (Body); // KF add 161009 | 1577 | if (!d.BodyIsEnabled (Body)) d.BodyEnable (Body); // KF add 161009 |
1578 | /* | ||
1578 | // NON-'VEHICLES' are dealt with here | 1579 | // NON-'VEHICLES' are dealt with here |
1579 | if (d.BodyIsEnabled(Body) && !m_angularlock.ApproxEquals(Vector3.Zero, 0.003f)) | 1580 | if (d.BodyIsEnabled(Body) && !m_angularlock.ApproxEquals(Vector3.Zero, 0.003f)) |
1580 | { | 1581 | { |
@@ -1587,6 +1588,7 @@ Console.WriteLine(" JointCreateFixed"); | |||
1587 | avel2.Z = 0; | 1588 | avel2.Z = 0; |
1588 | d.BodySetAngularVel(Body, avel2.X, avel2.Y, avel2.Z); | 1589 | d.BodySetAngularVel(Body, avel2.X, avel2.Y, avel2.Z); |
1589 | } | 1590 | } |
1591 | */ | ||
1590 | //float PID_P = 900.0f; | 1592 | //float PID_P = 900.0f; |
1591 | 1593 | ||
1592 | float m_mass = CalculateMass(); | 1594 | float m_mass = CalculateMass(); |