aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs
diff options
context:
space:
mode:
authorJohn Hurliman2010-06-11 15:37:25 -0700
committerJohn Hurliman2010-06-11 15:37:25 -0700
commitd1a324888be2a0db247999928dff12d0bb62cddd (patch)
treed5038ea284401fd2f4661f3a00ad60ede069bd7a /OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs
parentAllow IInventoryService.GetFolder(folderId, userId) as well as GetFolder(Inve... (diff)
downloadopensim-SC_OLD-d1a324888be2a0db247999928dff12d0bb62cddd.zip
opensim-SC_OLD-d1a324888be2a0db247999928dff12d0bb62cddd.tar.gz
opensim-SC_OLD-d1a324888be2a0db247999928dff12d0bb62cddd.tar.bz2
opensim-SC_OLD-d1a324888be2a0db247999928dff12d0bb62cddd.tar.xz
* Added a new method to IMapImageGenerator for getting the map tile before it is JPEG2000 compressed
* Aesthetically improved map tile water * SimianGrid connector now uploads a PNG tile to the AddMapTile API
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs
index 4ecad74..8b34f6e 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs
@@ -136,6 +136,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
136 private static readonly UUID defaultTerrainTexture4 = new UUID("53a2f406-4895-1d13-d541-d2e3b86bc19c"); 136 private static readonly UUID defaultTerrainTexture4 = new UUID("53a2f406-4895-1d13-d541-d2e3b86bc19c");
137 private static readonly Color defaultColor4 = Color.FromArgb(200, 200, 200); 137 private static readonly Color defaultColor4 = Color.FromArgb(200, 200, 200);
138 138
139 private static readonly Color WATER_COLOR = Color.FromArgb(29, 71, 95);
140
139 #endregion 141 #endregion
140 142
141 143
@@ -406,8 +408,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
406 408
407 heightvalue = 100f - (heightvalue * 100f) / 19f; // 0 - 19 => 100 - 0 409 heightvalue = 100f - (heightvalue * 100f) / 19f; // 0 - 19 => 100 - 0
408 410
409 Color water = Color.FromArgb((int)heightvalue, (int)heightvalue, 255); 411 mapbmp.SetPixel(x, yr, WATER_COLOR);
410 mapbmp.SetPixel(x, yr, water);
411 } 412 }
412 } 413 }
413 } 414 }