diff options
Merge branch 'master' into careminster
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 7ef44db..d38f34b 100644 --- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs +++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | |||
@@ -74,8 +74,8 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
74 | { | 74 | { |
75 | m_config = source; | 75 | m_config = source; |
76 | 76 | ||
77 | IConfig startupConfig = m_config.Configs["Startup"]; | 77 | if (Util.GetConfigVarFromSections<string>( |
78 | if (startupConfig.GetString("MapImageModule", "MapImageModule") != "Warp3DImageModule") | 78 | m_config, "MapImageModule", new string[] { "Startup", "Map" }, "MapImageModule") != "Warp3DImageModule") |
79 | return; | 79 | return; |
80 | 80 | ||
81 | m_Enabled = true; | 81 | m_Enabled = true; |
@@ -157,16 +157,12 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
157 | bool drawPrimVolume = true; | 157 | bool drawPrimVolume = true; |
158 | bool textureTerrain = true; | 158 | bool textureTerrain = true; |
159 | 159 | ||
160 | try | 160 | string[] configSections = new string[] { "Map", "Startup" }; |
161 | { | 161 | |
162 | IConfig startupConfig = m_config.Configs["Startup"]; | 162 | drawPrimVolume |
163 | drawPrimVolume = startupConfig.GetBoolean("DrawPrimOnMapTile", drawPrimVolume); | 163 | = Util.GetConfigVarFromSections<bool>(m_config, "DrawPrimOnMapTile", configSections, drawPrimVolume); |
164 | textureTerrain = startupConfig.GetBoolean("TextureOnMapTile", textureTerrain); | 164 | textureTerrain |
165 | } | 165 | = Util.GetConfigVarFromSections<bool>(m_config, "TextureOnMapTile", configSections, textureTerrain); |
166 | catch | ||
167 | { | ||
168 | m_log.Warn("[WARP 3D IMAGE MODULE]: Failed to load StartupConfig"); | ||
169 | } | ||
170 | 166 | ||
171 | m_colors.Clear(); | 167 | m_colors.Clear(); |
172 | 168 | ||