diff options
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 2bb4b57..ebcea28 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -208,13 +208,13 @@ namespace OpenSim | |||
208 | /// <returns></returns> | 208 | /// <returns></returns> |
209 | public static IConfigSource DefaultConfig() | 209 | public static IConfigSource DefaultConfig() |
210 | { | 210 | { |
211 | IConfigSource DefaultConfig = new IniConfigSource(); | 211 | IConfigSource defaultConfig = new IniConfigSource(); |
212 | 212 | ||
213 | { | 213 | { |
214 | IConfig config = DefaultConfig.Configs["Startup"]; | 214 | IConfig config = defaultConfig.Configs["Startup"]; |
215 | 215 | ||
216 | if (null == config) | 216 | if (null == config) |
217 | config = DefaultConfig.AddConfig("Startup"); | 217 | config = defaultConfig.AddConfig("Startup"); |
218 | 218 | ||
219 | config.Set("gridmode", false); | 219 | config.Set("gridmode", false); |
220 | config.Set("physics", "basicphysics"); | 220 | config.Set("physics", "basicphysics"); |
@@ -233,10 +233,10 @@ namespace OpenSim | |||
233 | } | 233 | } |
234 | 234 | ||
235 | { | 235 | { |
236 | IConfig config = DefaultConfig.Configs["StandAlone"]; | 236 | IConfig config = defaultConfig.Configs["StandAlone"]; |
237 | 237 | ||
238 | if (null == config) | 238 | if (null == config) |
239 | config = DefaultConfig.AddConfig("StandAlone"); | 239 | config = defaultConfig.AddConfig("StandAlone"); |
240 | 240 | ||
241 | config.Set("accounts_authenticate", false); | 241 | config.Set("accounts_authenticate", false); |
242 | config.Set("welcome_message", "Welcome to OpenSimulator"); | 242 | config.Set("welcome_message", "Welcome to OpenSimulator"); |
@@ -250,10 +250,10 @@ namespace OpenSim | |||
250 | } | 250 | } |
251 | 251 | ||
252 | { | 252 | { |
253 | IConfig config = DefaultConfig.Configs["Network"]; | 253 | IConfig config = defaultConfig.Configs["Network"]; |
254 | 254 | ||
255 | if (null == config) | 255 | if (null == config) |
256 | config = DefaultConfig.AddConfig("Network"); | 256 | config = defaultConfig.AddConfig("Network"); |
257 | 257 | ||
258 | config.Set("default_location_x", 1000); | 258 | config.Set("default_location_x", 1000); |
259 | config.Set("default_location_y", 1000); | 259 | config.Set("default_location_y", 1000); |
@@ -270,7 +270,7 @@ namespace OpenSim | |||
270 | config.Set("secure_inventory_server", "true"); | 270 | config.Set("secure_inventory_server", "true"); |
271 | } | 271 | } |
272 | 272 | ||
273 | return DefaultConfig; | 273 | return defaultConfig; |
274 | } | 274 | } |
275 | 275 | ||
276 | protected virtual void ReadConfigSettings() | 276 | protected virtual void ReadConfigSettings() |
@@ -495,7 +495,7 @@ namespace OpenSim | |||
495 | } | 495 | } |
496 | 496 | ||
497 | IClientNetworkServer clientServer; | 497 | IClientNetworkServer clientServer; |
498 | Scene scene = SetupScene(regionInfo, proxyOffset, null, out clientServer); | 498 | Scene scene = SetupScene(regionInfo, proxyOffset, m_config.Source, out clientServer); |
499 | 499 | ||
500 | m_log.Info("[MODULES]: Loading Region's modules"); | 500 | m_log.Info("[MODULES]: Loading Region's modules"); |
501 | 501 | ||