diff options
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index cf9dc5d..d1f1074 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -79,7 +79,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
79 | public bool m_returnCollisions = false; | 79 | public bool m_returnCollisions = false; |
80 | 80 | ||
81 | // Default we're a Geometry | 81 | // Default we're a Geometry |
82 | private CollisionCategories m_collisionCategories = (CollisionCategories.Geom ); | 82 | private CollisionCategories m_collisionCategories = (CollisionCategories.Geom); |
83 | 83 | ||
84 | // Default, Collide with Other Geometries, spaces and Bodies | 84 | // Default, Collide with Other Geometries, spaces and Bodies |
85 | private CollisionCategories m_collisionFlags = m_default_collisionFlags; | 85 | private CollisionCategories m_collisionFlags = m_default_collisionFlags; |
@@ -1170,9 +1170,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1170 | 1170 | ||
1171 | if (m_usePID) | 1171 | if (m_usePID) |
1172 | { | 1172 | { |
1173 | |||
1174 | // If we're using the PID controller, then we have no gravity | 1173 | // If we're using the PID controller, then we have no gravity |
1175 | fz = ((9.8f) * this.Mass ); | 1174 | fz = 9.8f * this.Mass; |
1176 | 1175 | ||
1177 | // no lock; for now it's only called from within Simulate() | 1176 | // no lock; for now it's only called from within Simulate() |
1178 | 1177 | ||