diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs index 5e0dfa7..ed2b06a 100644 --- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs +++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | |||
@@ -71,8 +71,8 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
71 | { | 71 | { |
72 | m_config = source; | 72 | m_config = source; |
73 | 73 | ||
74 | IConfig startupConfig = m_config.Configs["Startup"]; | 74 | if (Util.GetConfigVarFromSections<string>( |
75 | if (startupConfig.GetString("MapImageModule", "MapImageModule") != "Warp3DImageModule") | 75 | m_config, "MapImageModule", new string[] { "Startup", "Map" }, "MapImageModule") != "Warp3DImageModule") |
76 | return; | 76 | return; |
77 | 77 | ||
78 | m_Enabled = true; | 78 | m_Enabled = true; |
@@ -143,16 +143,12 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
143 | bool drawPrimVolume = true; | 143 | bool drawPrimVolume = true; |
144 | bool textureTerrain = true; | 144 | bool textureTerrain = true; |
145 | 145 | ||
146 | try | 146 | string[] configSections = new string[] { "Map", "Startup" }; |
147 | { | 147 | |
148 | IConfig startupConfig = m_config.Configs["Startup"]; | 148 | drawPrimVolume |
149 | drawPrimVolume = startupConfig.GetBoolean("DrawPrimOnMapTile", drawPrimVolume); | 149 | = Util.GetConfigVarFromSections<bool>(m_config, "DrawPrimOnMapTile", configSections, drawPrimVolume); |
150 | textureTerrain = startupConfig.GetBoolean("TextureOnMapTile", textureTerrain); | 150 | textureTerrain |
151 | } | 151 | = Util.GetConfigVarFromSections<bool>(m_config, "TextureOnMapTile", configSections, textureTerrain); |
152 | catch | ||
153 | { | ||
154 | m_log.Warn("[WARP 3D IMAGE MODULE]: Failed to load StartupConfig"); | ||
155 | } | ||
156 | 152 | ||
157 | m_colors.Clear(); | 153 | m_colors.Clear(); |
158 | 154 | ||