diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/LegacyMap')
-rw-r--r-- | OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs | 14 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs index 1f2b7c4..b927cfa 100644 --- a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs +++ b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs | |||
@@ -82,11 +82,11 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
82 | 82 | ||
83 | string[] configSections = new string[] { "Map", "Startup" }; | 83 | string[] configSections = new string[] { "Map", "Startup" }; |
84 | 84 | ||
85 | drawPrimVolume | 85 | drawPrimVolume |
86 | = Util.GetConfigVarFromSections<bool>(m_config, "DrawPrimOnMapTile", configSections, drawPrimVolume); | 86 | = Util.GetConfigVarFromSections<bool>(m_config, "DrawPrimOnMapTile", configSections, drawPrimVolume); |
87 | textureTerrain | 87 | textureTerrain |
88 | = Util.GetConfigVarFromSections<bool>(m_config, "TextureOnMapTile", configSections, textureTerrain); | 88 | = Util.GetConfigVarFromSections<bool>(m_config, "TextureOnMapTile", configSections, textureTerrain); |
89 | generateMaptiles | 89 | generateMaptiles |
90 | = Util.GetConfigVarFromSections<bool>(m_config, "GenerateMaptiles", configSections, generateMaptiles); | 90 | = Util.GetConfigVarFromSections<bool>(m_config, "GenerateMaptiles", configSections, generateMaptiles); |
91 | 91 | ||
92 | if (generateMaptiles) | 92 | if (generateMaptiles) |
@@ -126,15 +126,15 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
126 | catch (Exception) | 126 | catch (Exception) |
127 | { | 127 | { |
128 | m_log.ErrorFormat( | 128 | m_log.ErrorFormat( |
129 | "[MAPTILE]: Failed to load Static map image texture file: {0} for {1}", | 129 | "[MAPTILE]: Failed to load Static map image texture file: {0} for {1}", |
130 | m_scene.RegionInfo.MaptileStaticFile, m_scene.Name); | 130 | m_scene.RegionInfo.MaptileStaticFile, m_scene.Name); |
131 | //mapbmp = new Bitmap((int)m_scene.Heightmap.Width, (int)m_scene.Heightmap.Height, System.Drawing.Imaging.PixelFormat.Format24bppRgb); | 131 | //mapbmp = new Bitmap((int)m_scene.Heightmap.Width, (int)m_scene.Heightmap.Height, System.Drawing.Imaging.PixelFormat.Format24bppRgb); |
132 | mapbmp = null; | 132 | mapbmp = null; |
133 | } | 133 | } |
134 | 134 | ||
135 | if (mapbmp != null) | 135 | if (mapbmp != null) |
136 | m_log.DebugFormat( | 136 | m_log.DebugFormat( |
137 | "[MAPTILE]: Static map image texture file {0} found for {1}", | 137 | "[MAPTILE]: Static map image texture file {0} found for {1}", |
138 | m_scene.RegionInfo.MaptileStaticFile, m_scene.Name); | 138 | m_scene.RegionInfo.MaptileStaticFile, m_scene.Name); |
139 | } | 139 | } |
140 | } | 140 | } |
@@ -308,7 +308,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
308 | List<uint> z_localIDs = new List<uint>(); | 308 | List<uint> z_localIDs = new List<uint>(); |
309 | Dictionary<uint, DrawStruct> z_sort = new Dictionary<uint, DrawStruct>(); | 309 | Dictionary<uint, DrawStruct> z_sort = new Dictionary<uint, DrawStruct>(); |
310 | 310 | ||
311 | try | 311 | try |
312 | { | 312 | { |
313 | lock (objs) | 313 | lock (objs) |
314 | { | 314 | { |
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs index 0ec2053..4b3ee18 100644 --- a/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs +++ b/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs | |||
@@ -180,7 +180,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
180 | 180 | ||
181 | ManagedImage managedImage; | 181 | ManagedImage managedImage; |
182 | Image image; | 182 | Image image; |
183 | 183 | ||
184 | try | 184 | try |
185 | { | 185 | { |
186 | if (OpenJPEG.DecodeToImage(asset.Data, out managedImage, out image)) | 186 | if (OpenJPEG.DecodeToImage(asset.Data, out managedImage, out image)) |
@@ -201,7 +201,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
201 | m_log.ErrorFormat("{0} OpenJpeg was unable to encode this. Asset Data is empty for {1}", LogHeader, id); | 201 | m_log.ErrorFormat("{0} OpenJpeg was unable to encode this. Asset Data is empty for {1}", LogHeader, id); |
202 | } | 202 | } |
203 | return null; | 203 | return null; |
204 | 204 | ||
205 | } | 205 | } |
206 | 206 | ||
207 | // Compute the average color of a texture. | 207 | // Compute the average color of a texture. |