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

From: Alan M Webb <alan_webb@us.ibm.com> 

Add sanity check to fly-height calculation so that it does
  not attempt to retrieve information from non-existent
  regions.
0.6.5-rc1
Dr Scofield 2009-03-31 12:45:34 +00:00
parent 62fcfe8924
commit aecb4fb72a
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
View File

@ -1297,6 +1297,9 @@ namespace OpenSim.Region.Physics.OdePlugin
// Recovered for use by fly height. Kitto Flora // Recovered for use by fly height. Kitto Flora
public float GetTerrainHeightAtXY(float x, float y) public float GetTerrainHeightAtXY(float x, float y)
{ {
int index;
// Teravus: Kitto, this code causes recurring errors that stall physics permenantly unless // Teravus: Kitto, this code causes recurring errors that stall physics permenantly unless
// the values are checked, so checking below. // the values are checked, so checking below.
// Is there any reason that we don't do this in ScenePresence? // Is there any reason that we don't do this in ScenePresence?
@ -1306,7 +1309,12 @@ namespace OpenSim.Region.Physics.OdePlugin
(int)x < 0.001f || (int)y < 0.001f) (int)x < 0.001f || (int)y < 0.001f)
return 0; return 0;
return (float)_origheightmap[(int)y * Constants.RegionSize + (int)x]; index = (int) ((int)y * Constants.RegionSize + (int)x);
if (index < _origheightmap.Length)
return (float)_origheightmap[(int)y * Constants.RegionSize + (int)x];
else
return 0;
} }
// End recovered. Kitto Flora // End recovered. Kitto Flora