aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/EstateSettings.cs26
-rw-r--r--OpenSim/Framework/RegionSettings.cs10
2 files changed, 24 insertions, 12 deletions
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 8cd876a..b7dccdb 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -277,16 +277,22 @@ namespace OpenSim.Framework
277 { 277 {
278 if (configMember == null) 278 if (configMember == null)
279 { 279 {
280 // Load legacy defaults 280 try
281 // 281 {
282 configMember = 282 // Load legacy defaults
283 new ConfigurationMember(Path.Combine(Util.configDir(), 283 //
284 "estate_settings.xml"), "ESTATE SETTINGS", 284 configMember =
285 loadConfigurationOptions, 285 new ConfigurationMember(Path.Combine(Util.configDir(),
286 handleIncomingConfiguration, true); 286 "estate_settings.xml"), "ESTATE SETTINGS",
287 287 loadConfigurationOptions,
288 l_EstateManagers.Clear(); 288 handleIncomingConfiguration, true);
289 configMember.performConfigurationRetrieve(); 289
290 l_EstateManagers.Clear();
291 configMember.performConfigurationRetrieve();
292 }
293 catch (Exception e)
294 {
295 }
290 } 296 }
291 } 297 }
292 298
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index 64f6768..6281d6c 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -45,8 +45,14 @@ namespace OpenSim.Framework
45 { 45 {
46 if (configMember == null) 46 if (configMember == null)
47 { 47 {
48 configMember = new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS", LoadConfigurationOptions, HandleIncomingConfiguration, true); 48 try
49 configMember.performConfigurationRetrieve(); 49 {
50 configMember = new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS", LoadConfigurationOptions, HandleIncomingConfiguration, true);
51 configMember.performConfigurationRetrieve();
52 }
53 catch (Exception e)
54 {
55 }
50 } 56 }
51 } 57 }
52 58