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

Massive tab and trailing space cleanup

Browse Source
This commit is contained in:
Melanie Thielker
2017-01-05 19:07:37 +00:00
parent e88e2945e9
commit b16abc8166
959 changed files with 23646 additions and 23646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
View File

@@ -82,11 +82,11 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
string[] configSections = new string[] { "Map", "Startup" };
drawPrimVolume
drawPrimVolume
= Util.GetConfigVarFromSections<bool>(m_config, "DrawPrimOnMapTile", configSections, drawPrimVolume);
textureTerrain
textureTerrain
= Util.GetConfigVarFromSections<bool>(m_config, "TextureOnMapTile", configSections, textureTerrain);
generateMaptiles
generateMaptiles
= Util.GetConfigVarFromSections<bool>(m_config, "GenerateMaptiles", configSections, generateMaptiles);
if (generateMaptiles)
@@ -126,15 +126,15 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
catch (Exception)
{
m_log.ErrorFormat(
"[MAPTILE]: Failed to load Static map image texture file: {0} for {1}",
"[MAPTILE]: Failed to load Static map image texture file: {0} for {1}",
m_scene.RegionInfo.MaptileStaticFile, m_scene.Name);
//mapbmp = new Bitmap((int)m_scene.Heightmap.Width, (int)m_scene.Heightmap.Height, System.Drawing.Imaging.PixelFormat.Format24bppRgb);
mapbmp = null;
}
if (mapbmp != null)
if (mapbmp != null)
m_log.DebugFormat(
"[MAPTILE]: Static map image texture file {0} found for {1}",
"[MAPTILE]: Static map image texture file {0} found for {1}",
m_scene.RegionInfo.MaptileStaticFile, m_scene.Name);
}
}
@@ -308,7 +308,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
List<uint> z_localIDs = new List<uint>();
Dictionary<uint, DrawStruct> z_sort = new Dictionary<uint, DrawStruct>();
try
try
{
lock (objs)
{

4
OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
View File

@@ -180,7 +180,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
ManagedImage managedImage;
Image image;
try
{
if (OpenJPEG.DecodeToImage(asset.Data, out managedImage, out image))
@@ -201,7 +201,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
m_log.ErrorFormat("{0} OpenJpeg was unable to encode this. Asset Data is empty for {1}", LogHeader, id);
}
return null;
}
// Compute the average color of a texture.