aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-05 19:36:48 +0000
committerJustin Clarke Casey2009-01-05 19:36:48 +0000
commite7ac639f3a8a05858df03a8b5fd611826a56ae97 (patch)
tree926414fc9cdb51eeec3239d2c558110f7ea27f8b /OpenSim/Region
parent* add the required System.xml reference as well (diff)
downloadopensim-SC-e7ac639f3a8a05858df03a8b5fd611826a56ae97.zip
opensim-SC-e7ac639f3a8a05858df03a8b5fd611826a56ae97.tar.gz
opensim-SC-e7ac639f3a8a05858df03a8b5fd611826a56ae97.tar.bz2
opensim-SC-e7ac639f3a8a05858df03a8b5fd611826a56ae97.tar.xz
* Centralize references to the well known blank texture 5748decc-f629-461c-9a36-a35a221fe21f to a constant in OpenSim.Framework.Util
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs
index ff8d0b9..c5efb4f 100644
--- a/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs
+++ b/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs
@@ -129,7 +129,6 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
129 private static readonly Color defaultColor3 = Color.FromArgb(162, 154, 141); 129 private static readonly Color defaultColor3 = Color.FromArgb(162, 154, 141);
130 private static readonly UUID defaultTerrainTexture4 = new UUID("53a2f406-4895-1d13-d541-d2e3b86bc19c"); 130 private static readonly UUID defaultTerrainTexture4 = new UUID("53a2f406-4895-1d13-d541-d2e3b86bc19c");
131 private static readonly Color defaultColor4 = Color.FromArgb(200, 200, 200); 131 private static readonly Color defaultColor4 = Color.FromArgb(200, 200, 200);
132 private static readonly UUID blankTerrainTexture = new UUID("5748decc-f629-461c-9a36-a35a221fe21f");
133 132
134 #endregion 133 #endregion
135 134
@@ -153,7 +152,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
153 m_mapping.Add(defaultTerrainTexture2, defaultColor2); 152 m_mapping.Add(defaultTerrainTexture2, defaultColor2);
154 m_mapping.Add(defaultTerrainTexture3, defaultColor3); 153 m_mapping.Add(defaultTerrainTexture3, defaultColor3);
155 m_mapping.Add(defaultTerrainTexture4, defaultColor4); 154 m_mapping.Add(defaultTerrainTexture4, defaultColor4);
156 m_mapping.Add(blankTerrainTexture, Color.White); 155 m_mapping.Add(Util.BLANK_TEXTURE_UUID, Color.White);
157 } 156 }
158 157
159 #region Helpers 158 #region Helpers