ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of brain.opensimulator.org:/var/git/opensim

Browse Source
This commit is contained in:
Melanie
2019-08-07 17:58:55 +01:00
parent d781742d8e 21aa26d796
commit ba680ceecb
35 changed files with 824 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/World/Land/LandObject.cs
View File

@@ -994,7 +994,7 @@ namespace OpenSim.Region.CoreModules.World.Land
}
else
{
// keeping previus odd average
// keeping previous odd average
avgx = (avgx * tempArea + x) / (tempArea + 1);
avgy = (avgy * tempArea + y) / (tempArea + 1);
}

5
OpenSim/Region/CoreModules/World/Warp3DMap/TerrainSplat.cs
View File

@@ -441,6 +441,9 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
startHeights[0], startHeights[2],
startHeights[1], startHeights[3],
pctX, pctY);
if (float.IsNaN(startHeight))
return 0;
startHeight = Utils.Clamp(startHeight, 0f, 255f);
float heightRange = ImageUtils.Bilinear(
@@ -448,7 +451,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
heightRanges[1], heightRanges[3],
pctX, pctY);
heightRange = Utils.Clamp(heightRange, 0f, 255f);
if(heightRange == 0f)
if(heightRange == 0f || float.IsNaN(heightRange))
return 0;
// Generate two frequencies of perlin noise based on our global position