diff options
author | Justin Clark-Casey (justincc) | 2011-09-17 01:33:55 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-09-17 01:33:55 +0100 |
commit | 1e798136c3458b8255fcb6341713bf9dbb689f4b (patch) | |
tree | cbd2705923918b367780247a5704dbcfa488edf4 /OpenSim/Region/Physics | |
parent | Add BulletSim physics option details to OpenSim.ini.example. Marked as in de... (diff) | |
download | opensim-SC_OLD-1e798136c3458b8255fcb6341713bf9dbb689f4b.zip opensim-SC_OLD-1e798136c3458b8255fcb6341713bf9dbb689f4b.tar.gz opensim-SC_OLD-1e798136c3458b8255fcb6341713bf9dbb689f4b.tar.bz2 opensim-SC_OLD-1e798136c3458b8255fcb6341713bf9dbb689f4b.tar.xz |
adjust some whitespace to trigger another build, to check the last failure was just a glitch
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 924d7c2..ac92b8b 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -1526,6 +1526,7 @@ Console.WriteLine("changeadd 1"); | |||
1526 | { | 1526 | { |
1527 | if (Body == IntPtr.Zero) | 1527 | if (Body == IntPtr.Zero) |
1528 | enableBody(); | 1528 | enableBody(); |
1529 | |||
1529 | //Prim auto disable after 20 frames, | 1530 | //Prim auto disable after 20 frames, |
1530 | //if you move it, re-enable the prim manually. | 1531 | //if you move it, re-enable the prim manually. |
1531 | if (_parent != null) | 1532 | if (_parent != null) |
@@ -1536,6 +1537,7 @@ Console.WriteLine("changeadd 1"); | |||
1536 | m_linkJoint = IntPtr.Zero; | 1537 | m_linkJoint = IntPtr.Zero; |
1537 | } | 1538 | } |
1538 | } | 1539 | } |
1540 | |||
1539 | if (Body != IntPtr.Zero) | 1541 | if (Body != IntPtr.Zero) |
1540 | { | 1542 | { |
1541 | d.BodySetPosition(Body, _position.X, _position.Y, _position.Z); | 1543 | d.BodySetPosition(Body, _position.X, _position.Y, _position.Z); |
@@ -1599,7 +1601,6 @@ Console.WriteLine(" JointCreateFixed"); | |||
1599 | float fy = 0; | 1601 | float fy = 0; |
1600 | float fz = 0; | 1602 | float fz = 0; |
1601 | 1603 | ||
1602 | |||
1603 | if (IsPhysical && (Body != IntPtr.Zero) && !m_isSelected && !childPrim) // KF: Only move root prims. | 1604 | if (IsPhysical && (Body != IntPtr.Zero) && !m_isSelected && !childPrim) // KF: Only move root prims. |
1604 | { | 1605 | { |
1605 | if (m_vehicle.Type != Vehicle.TYPE_NONE) | 1606 | if (m_vehicle.Type != Vehicle.TYPE_NONE) |
@@ -1818,7 +1819,6 @@ Console.WriteLine(" JointCreateFixed"); | |||
1818 | // 35x10 = 350n times the mass per second applied maximum. | 1819 | // 35x10 = 350n times the mass per second applied maximum. |
1819 | float nmax = 35f * m_mass; | 1820 | float nmax = 35f * m_mass; |
1820 | float nmin = -35f * m_mass; | 1821 | float nmin = -35f * m_mass; |
1821 | |||
1822 | 1822 | ||
1823 | if (fx > nmax) | 1823 | if (fx > nmax) |
1824 | fx = nmax; | 1824 | fx = nmax; |