diff options
author | Robert Adams | 2012-10-22 16:33:21 -0700 |
---|---|---|
committer | Robert Adams | 2012-10-22 22:24:59 -0700 |
commit | 14eeb8b31b865f7b1927703028b03b6f61693cb6 (patch) | |
tree | 3139a56a535d1919a8cb4b6d93a66e3100866c51 /OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs | |
parent | BulletSim: fix problem of not rebuilding shape by clearing last rebuild faile... (diff) | |
download | opensim-SC-14eeb8b31b865f7b1927703028b03b6f61693cb6.zip opensim-SC-14eeb8b31b865f7b1927703028b03b6f61693cb6.tar.gz opensim-SC-14eeb8b31b865f7b1927703028b03b6f61693cb6.tar.bz2 opensim-SC-14eeb8b31b865f7b1927703028b03b6f61693cb6.tar.xz |
BulletSim: fix bug that caused error (and a crash on 32 bit Linux) when mesh assets weren't already in the cache. Comment cleanups.
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs index 4106534..ae267e3 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs | |||
@@ -201,9 +201,7 @@ public class BSTerrainManager | |||
201 | // If called with a mapInfo in m_heightMaps and there is an existing terrain body, a new | 201 | // If called with a mapInfo in m_heightMaps and there is an existing terrain body, a new |
202 | // terrain shape is created and added to the body. | 202 | // terrain shape is created and added to the body. |
203 | // This call is most often used to update the heightMap and parameters of the terrain. | 203 | // This call is most often used to update the heightMap and parameters of the terrain. |
204 | // The 'doNow' boolean says whether to do all the unmanaged activities right now (like when | 204 | // (The above does suggest that some simplification/refactoring is in order.) |
205 | // calling this routine from initialization or taint-time routines) or whether to delay | ||
206 | // all the unmanaged activities to taint-time. | ||
207 | private void UpdateOrCreateTerrain(uint id, float[] heightMap, Vector3 minCoords, Vector3 maxCoords, bool inTaintTime) | 205 | private void UpdateOrCreateTerrain(uint id, float[] heightMap, Vector3 minCoords, Vector3 maxCoords, bool inTaintTime) |
208 | { | 206 | { |
209 | DetailLog("{0},BSTerrainManager.UpdateOrCreateTerrain,call,minC={1},maxC={2},inTaintTime={3}", | 207 | DetailLog("{0},BSTerrainManager.UpdateOrCreateTerrain,call,minC={1},maxC={2},inTaintTime={3}", |