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

cosmetics

0.9.1.0-post-fixes
UbitUmarov 2019-07-30 17:51:20 +01:00
parent 08b62c8daa
commit 87eb2fa9da
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Capabilities/Handlers/GetAssets/GetAssetsHandler.cs
View File

@ -138,8 +138,6 @@ namespace OpenSim.Capabilities.Handlers
if(type == AssetType.Mesh || type == AssetType.Texture) if(type == AssetType.Mesh || type == AssetType.Texture)
responsedata["throttle"] = true; responsedata["throttle"] = true;
// else
// m_log.Warn("[GETASSETS]: type: " + query);
responsedata["content_type"] = asset.Metadata.ContentType; responsedata["content_type"] = asset.Metadata.ContentType;
responsedata["bin_response_data"] = asset.Data; responsedata["bin_response_data"] = asset.Data;

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

@ -994,7 +994,7 @@ namespace OpenSim.Region.CoreModules.World.Land
} }
else else
{ {
// keeping previus odd average // keeping previous odd average
avgx = (avgx * tempArea + x) / (tempArea + 1); avgx = (avgx * tempArea + x) / (tempArea + 1);
avgy = (avgy * tempArea + y) / (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[0], startHeights[2],
startHeights[1], startHeights[3], startHeights[1], startHeights[3],
pctX, pctY); pctX, pctY);
if (float.IsNaN(startHeight))
return 0;
startHeight = Utils.Clamp(startHeight, 0f, 255f); startHeight = Utils.Clamp(startHeight, 0f, 255f);
float heightRange = ImageUtils.Bilinear( float heightRange = ImageUtils.Bilinear(
@ -448,7 +451,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
heightRanges[1], heightRanges[3], heightRanges[1], heightRanges[3],
pctX, pctY); pctX, pctY);
heightRange = Utils.Clamp(heightRange, 0f, 255f); heightRange = Utils.Clamp(heightRange, 0f, 255f);
if(heightRange == 0f) if(heightRange == 0f || float.IsNaN(heightRange))
return 0; return 0;
// Generate two frequencies of perlin noise based on our global position // Generate two frequencies of perlin noise based on our global position