diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs index 8cd876a9f3..b7dccdb5f4 100644 --- a/OpenSim/Framework/EstateSettings.cs +++ b/OpenSim/Framework/EstateSettings.cs @@ -277,16 +277,22 @@ namespace OpenSim.Framework { if (configMember == null) { - // Load legacy defaults - // - configMember = - new ConfigurationMember(Path.Combine(Util.configDir(), - "estate_settings.xml"), "ESTATE SETTINGS", - loadConfigurationOptions, - handleIncomingConfiguration, true); + try + { + // Load legacy defaults + // + configMember = + new ConfigurationMember(Path.Combine(Util.configDir(), + "estate_settings.xml"), "ESTATE SETTINGS", + loadConfigurationOptions, + handleIncomingConfiguration, true); - l_EstateManagers.Clear(); - configMember.performConfigurationRetrieve(); + l_EstateManagers.Clear(); + configMember.performConfigurationRetrieve(); + } + catch (Exception e) + { + } } } diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs index 64f6768a16..6281d6cfa5 100644 --- a/OpenSim/Framework/RegionSettings.cs +++ b/OpenSim/Framework/RegionSettings.cs @@ -45,8 +45,14 @@ namespace OpenSim.Framework { if (configMember == null) { - configMember = new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS", LoadConfigurationOptions, HandleIncomingConfiguration, true); - configMember.performConfigurationRetrieve(); + try + { + configMember = new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS", LoadConfigurationOptions, HandleIncomingConfiguration, true); + configMember.performConfigurationRetrieve(); + } + catch (Exception e) + { + } } }