cosmetics
parent
08b62c8daa
commit
87eb2fa9da
|
@ -138,8 +138,6 @@ namespace OpenSim.Capabilities.Handlers
|
|||
|
||||
if(type == AssetType.Mesh || type == AssetType.Texture)
|
||||
responsedata["throttle"] = true;
|
||||
// else
|
||||
// m_log.Warn("[GETASSETS]: type: " + query);
|
||||
|
||||
responsedata["content_type"] = asset.Metadata.ContentType;
|
||||
responsedata["bin_response_data"] = asset.Data;
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue