OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '1e798136c3458b8255fcb6341713bf9dbb689f4b' into bigmerge

avinationmerge
Melanie 2011-10-11 22:23:16 +01:00
parent 36ec9f0e94 1e798136c3
commit 34954172a1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1526,6 +1526,7 @@ Console.WriteLine("changeadd 1");
{ {
if (Body == IntPtr.Zero) if (Body == IntPtr.Zero)
enableBody(); enableBody();
//Prim auto disable after 20 frames, //Prim auto disable after 20 frames,
//if you move it, re-enable the prim manually. //if you move it, re-enable the prim manually.
if (_parent != null) if (_parent != null)
@ -1536,6 +1537,7 @@ Console.WriteLine("changeadd 1");
m_linkJoint = IntPtr.Zero; m_linkJoint = IntPtr.Zero;
} }
} }
if (Body != IntPtr.Zero) if (Body != IntPtr.Zero)
{ {
d.BodySetPosition(Body, _position.X, _position.Y, _position.Z); d.BodySetPosition(Body, _position.X, _position.Y, _position.Z);
@ -1599,7 +1601,6 @@ Console.WriteLine(" JointCreateFixed");
float fy = 0; float fy = 0;
float fz = 0; float fz = 0;
if (IsPhysical && (Body != IntPtr.Zero) && !m_isSelected && !childPrim) // KF: Only move root prims. if (IsPhysical && (Body != IntPtr.Zero) && !m_isSelected && !childPrim) // KF: Only move root prims.
{ {
if (m_vehicle.Type != Vehicle.TYPE_NONE) if (m_vehicle.Type != Vehicle.TYPE_NONE)
@ -1818,7 +1819,6 @@ Console.WriteLine(" JointCreateFixed");
// 35x10 = 350n times the mass per second applied maximum. // 35x10 = 350n times the mass per second applied maximum.
float nmax = 35f * m_mass; float nmax = 35f * m_mass;
float nmin = -35f * m_mass; float nmin = -35f * m_mass;
if (fx > nmax) if (fx > nmax)
fx = nmax; fx = nmax;