diff options
author | Justin Clark-Casey (justincc) | 2009-11-09 17:43:32 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-11-09 17:43:32 +0000 |
commit | 3274bc39c8e0c477485c03b31acbe3a9bde0c37e (patch) | |
tree | 8dcb61509ddb335bb65b25f5d67ea538555e1f8c | |
parent | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-3274bc39c8e0c477485c03b31acbe3a9bde0c37e.zip opensim-SC_OLD-3274bc39c8e0c477485c03b31acbe3a9bde0c37e.tar.gz opensim-SC_OLD-3274bc39c8e0c477485c03b31acbe3a9bde0c37e.tar.bz2 opensim-SC_OLD-3274bc39c8e0c477485c03b31acbe3a9bde0c37e.tar.xz |
minor: remove some mono compiler warnings
-rw-r--r-- | OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Meshing/PrimMesher.cs | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs index cbe73bb..1e94ee2 100644 --- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs +++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs | |||
@@ -347,6 +347,7 @@ namespace OpenSim.Region.Physics.BulletXPlugin | |||
347 | { | 347 | { |
348 | indexBase = mesh.getIndexListAsInt(); | 348 | indexBase = mesh.getIndexListAsInt(); |
349 | vertexBase = new Vector3[iVertexCount]; | 349 | vertexBase = new Vector3[iVertexCount]; |
350 | |||
350 | for (int i = 0; i < iVertexCount; i++) | 351 | for (int i = 0; i < iVertexCount; i++) |
351 | { | 352 | { |
352 | OpenMetaverse.Vector3 v = mesh.getVertexList()[i]; | 353 | OpenMetaverse.Vector3 v = mesh.getVertexList()[i]; |
@@ -355,6 +356,7 @@ namespace OpenSim.Region.Physics.BulletXPlugin | |||
355 | else | 356 | else |
356 | vertexBase[i] = Vector3.Zero; | 357 | vertexBase[i] = Vector3.Zero; |
357 | } | 358 | } |
359 | |||
358 | for (int ix = 0; ix < iIndexCount; ix += 3) | 360 | for (int ix = 0; ix < iIndexCount; ix += 3) |
359 | { | 361 | { |
360 | int ia = indexBase[ix + 0]; | 362 | int ia = indexBase[ix + 0]; |
diff --git a/OpenSim/Region/Physics/Meshing/PrimMesher.cs b/OpenSim/Region/Physics/Meshing/PrimMesher.cs index c7c9160..2a213c3 100644 --- a/OpenSim/Region/Physics/Meshing/PrimMesher.cs +++ b/OpenSim/Region/Physics/Meshing/PrimMesher.cs | |||
@@ -1348,7 +1348,7 @@ namespace PrimMesher | |||
1348 | float stepSize = twoPi / this.stepsPerRevolution; | 1348 | float stepSize = twoPi / this.stepsPerRevolution; |
1349 | 1349 | ||
1350 | int step = (int)(startAngle / stepSize); | 1350 | int step = (int)(startAngle / stepSize); |
1351 | int firstStep = step; | 1351 | // int firstStep = step; |
1352 | float angle = startAngle; | 1352 | float angle = startAngle; |
1353 | 1353 | ||
1354 | bool done = false; | 1354 | bool done = false; |
@@ -1738,7 +1738,7 @@ namespace PrimMesher | |||
1738 | // append this layer | 1738 | // append this layer |
1739 | 1739 | ||
1740 | int coordsLen = this.coords.Count; | 1740 | int coordsLen = this.coords.Count; |
1741 | int lastCoordsLen = coordsLen; | 1741 | // int lastCoordsLen = coordsLen; |
1742 | newLayer.AddValue2FaceVertexIndices(coordsLen); | 1742 | newLayer.AddValue2FaceVertexIndices(coordsLen); |
1743 | 1743 | ||
1744 | this.coords.AddRange(newLayer.coords); | 1744 | this.coords.AddRange(newLayer.coords); |