OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '581885da75c57250201b34e2d585d32c8f07089a' into bigmerge

avinationmerge
Melanie 2011-10-25 02:55:46 +01:00
parent 6a01246cc6 581885da75
commit 71b4486356
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Physics/OdePlugin/OdeScene.cs
View File

@ -3444,6 +3444,9 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name);
private void SetTerrain(float[] heightMap, Vector3 pOffset) private void SetTerrain(float[] heightMap, Vector3 pOffset)
{ {
int startTime = Util.EnvironmentTickCount();
m_log.DebugFormat("[PHYSICS]: Setting terrain for {0}", Name);
// this._heightmap[i] = (double)heightMap[i]; // this._heightmap[i] = (double)heightMap[i];
// dbm (danx0r) -- creating a buffer zone of one extra sample all around // dbm (danx0r) -- creating a buffer zone of one extra sample all around
//_origheightmap = heightMap; //_origheightmap = heightMap;
@ -3565,6 +3568,9 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name);
RegionTerrain.Add(pOffset, GroundGeom, GroundGeom); RegionTerrain.Add(pOffset, GroundGeom, GroundGeom);
TerrainHeightFieldHeights.Add(GroundGeom,_heightmap); TerrainHeightFieldHeights.Add(GroundGeom,_heightmap);
} }
m_log.DebugFormat(
"[PHYSICS]: Setting terrain for {0} took {1}ms", Name, Util.EnvironmentTickCountSubtract(startTime));
} }
public override void DeleteTerrain() public override void DeleteTerrain()