diff options
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r-- | OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs index 102a1e6..ddfb5a4 100644 --- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs +++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs | |||
@@ -729,7 +729,7 @@ namespace OpenSim.Region.Physics.BulletXPlugin | |||
729 | { | 729 | { |
730 | prim.UpdateKinetics(); | 730 | prim.UpdateKinetics(); |
731 | } | 731 | } |
732 | //if(this._simFlatPlanet!=null) this._simFlatPlanet.Restore(); | 732 | //if (this._simFlatPlanet!=null) this._simFlatPlanet.Restore(); |
733 | } | 733 | } |
734 | 734 | ||
735 | public override void GetResults() | 735 | public override void GetResults() |
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index d48a97e..5008927 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |||
@@ -162,7 +162,7 @@ namespace OpenSim.Region.Physics.Meshing | |||
162 | } | 162 | } |
163 | 163 | ||
164 | // each simplex still in the list belongs to the hull of the region in question | 164 | // each simplex still in the list belongs to the hull of the region in question |
165 | // The new vertex (yes, we still deal with verices here :-) ) forms a triangle | 165 | // The new vertex (yes, we still deal with verices here :-)) forms a triangle |
166 | // with each of these simplices. Build the new triangles and add them to the list | 166 | // with each of these simplices. Build the new triangles and add them to the list |
167 | foreach (Simplex s in simplices) | 167 | foreach (Simplex s in simplices) |
168 | { | 168 | { |
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 | ||