aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
diff options
context:
space:
mode:
authorRobert Adams2012-11-24 19:57:11 -0800
committerRobert Adams2012-11-25 20:04:27 -0800
commitc3f30fef96674e9f43a277399c987a85cec9a7d3 (patch)
tree633d47fcc341c04ffbe4f36dce78c42daef2301c /OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
parentBulletSim: Add tables and initialization for different attributes for differe... (diff)
downloadopensim-SC_OLD-c3f30fef96674e9f43a277399c987a85cec9a7d3.zip
opensim-SC_OLD-c3f30fef96674e9f43a277399c987a85cec9a7d3.tar.gz
opensim-SC_OLD-c3f30fef96674e9f43a277399c987a85cec9a7d3.tar.bz2
opensim-SC_OLD-c3f30fef96674e9f43a277399c987a85cec9a7d3.tar.xz
BulletSim: add parameter for terrain collision margin.
Add locking around unlikely but possible race conditions on terrain list.
Diffstat (limited to '')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs4
1 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
index dca7150..d7afdeb 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
@@ -217,8 +217,6 @@ public sealed class BSTerrainMesh : BSTerrainPhys
217 } 217 }
218 } 218 }
219 verticesCount = verticesCount / 3; 219 verticesCount = verticesCount / 3;
220 physicsScene.DetailLog("{0},BSTerrainMesh.ConvertHeightMapToMesh,completeVerts,verCount={1}",
221 BSScene.DetailLogZero, verticesCount);
222 220
223 for (int yy = 0; yy < sizeY; yy++) 221 for (int yy = 0; yy < sizeY; yy++)
224 { 222 {
@@ -235,8 +233,6 @@ public sealed class BSTerrainMesh : BSTerrainPhys
235 indicesCount += 6; 233 indicesCount += 6;
236 } 234 }
237 } 235 }
238 physicsScene.DetailLog("{0},BSTerrainMesh.ConvertHeightMapToMesh,completeIndices,indCount={1}", // DEEBUG DEBUG DEBUG
239 LogHeader, indicesCount); // DEBUG
240 ret = true; 236 ret = true;
241 } 237 }
242 catch (Exception e) 238 catch (Exception e)