Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization

2 files changed, 3 insertions, 3 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 496e097..63bfc90 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -816,8 +816,8 @@ namespace OpenSim.Region.Physics.OdePlugin
             IntPtr vertices, indices;
             int vertexCount, indexCount;
             int vertexStride, triStride;
-            mesh.getVertexListAsPtrToFloatArray( out vertices, out vertexStride, out vertexCount ); // Note, that vertices are fixed in unmanaged heap
-            mesh.getIndexListAsPtrToIntArray( out indices, out triStride, out indexCount ); // Also fixed, needs release after usage
+            mesh.getVertexListAsPtrToFloatArray(out vertices, out vertexStride, out vertexCount); // Note, that vertices are fixed in unmanaged heap
+            mesh.getIndexListAsPtrToIntArray(out indices, out triStride, out indexCount); // Also fixed, needs release after usage
 
             mesh.releaseSourceMeshData(); // free up the original mesh data to save memory
 
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 7187fbe..0c94fb6 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -3805,7 +3805,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         }
 
         public void start(int unused)
-        {            
+        {
             ds.SetViewpoint(ref xyz, ref hpr);
         }
 #endif