ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 04:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'careminster' into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie
2010-04-05 18:22:15 +01:00
parent fe034dc3e4 f505c1d0a4
commit ba31b31ed0
5 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
View File

@@ -804,6 +804,7 @@ namespace OpenSim.Region.Physics.OdePlugin
if (m_isphysical && Body != IntPtr.Zero)
{
d.BodyDisable(Body);
Halt();
}
}
@@ -2972,7 +2973,8 @@ Console.WriteLine(" JointCreateFixed");
m_wLinObjectVel = Vector3.Zero;
m_angularMotorDirection = Vector3.Zero;
m_lastAngularVelocity = Vector3.Zero;
m_angularMotorDVel = Vector3.Zero;
m_angularMotorDVel = Vector3.Zero;
_acceleration = Vector3.Zero;
}
private void UpdateLinDecay()