diff options
author | Robert Adams | 2014-01-26 07:56:47 -0800 |
---|---|---|
committer | Robert Adams | 2014-01-26 07:56:47 -0800 |
commit | 13a9d5409cdb14a66e88883fe2287b51554f3b88 (patch) | |
tree | a1f40f332400dd900f432f26ee34fabb317bde5c /OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs | |
parent | varregion: modify MapImageModule structure so it will better merge (diff) | |
parent | Merge branch 'justincc-master' (diff) | |
download | opensim-SC_OLD-13a9d5409cdb14a66e88883fe2287b51554f3b88.zip opensim-SC_OLD-13a9d5409cdb14a66e88883fe2287b51554f3b88.tar.gz opensim-SC_OLD-13a9d5409cdb14a66e88883fe2287b51554f3b88.tar.bz2 opensim-SC_OLD-13a9d5409cdb14a66e88883fe2287b51554f3b88.tar.xz |
Merge branch 'master' into varregion
Conflicts:
OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs
OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs index 413ac64..9f23141 100644 --- a/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs +++ b/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs | |||
@@ -232,10 +232,14 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
232 | if (textureID == UUID.Zero) return defaultColor; // not set | 232 | if (textureID == UUID.Zero) return defaultColor; // not set |
233 | if (m_mapping.ContainsKey(textureID)) return m_mapping[textureID]; // one of the predefined textures | 233 | if (m_mapping.ContainsKey(textureID)) return m_mapping[textureID]; // one of the predefined textures |
234 | 234 | ||
235 | Bitmap bmp = fetchTexture(textureID); | 235 | Color color; |
236 | Color color = bmp == null ? defaultColor : computeAverageColor(bmp); | 236 | |
237 | // store it for future reference | 237 | using (Bitmap bmp = fetchTexture(textureID)) |
238 | m_mapping[textureID] = color; | 238 | { |
239 | color = bmp == null ? defaultColor : computeAverageColor(bmp); | ||
240 | // store it for future reference | ||
241 | m_mapping[textureID] = color; | ||
242 | } | ||
239 | 243 | ||
240 | return color; | 244 | return color; |
241 | } | 245 | } |
@@ -417,7 +421,8 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
417 | } | 421 | } |
418 | } | 422 | } |
419 | } | 423 | } |
420 | m_log.Debug("[MAPTILE]: Generating Maptile Step 1: Done in " + (Environment.TickCount - tc) + " ms"); | 424 | |
425 | m_log.Debug("[TEXTURED MAP TILE RENDERER]: Generating Maptile Step 1: Done in " + (Environment.TickCount - tc) + " ms"); | ||
421 | } | 426 | } |
422 | } | 427 | } |
423 | } | 428 | } |