OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make a missing or read-only estate_settings.xml non-fatal

0.6.0-stable
Melanie Thielker 2008-10-11 15:41:25 +00:00
parent bed6c763a5
commit 94558603e5
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/EstateSettings.cs
View File

@ -276,6 +276,8 @@ namespace OpenSim.Framework
public EstateSettings() public EstateSettings()
{ {
if (configMember == null) if (configMember == null)
{
try
{ {
// Load legacy defaults // Load legacy defaults
// //
@ -288,6 +290,10 @@ namespace OpenSim.Framework
l_EstateManagers.Clear(); l_EstateManagers.Clear();
configMember.performConfigurationRetrieve(); configMember.performConfigurationRetrieve();
} }
catch (Exception e)
{
}
}
} }
public void Save() public void Save()

6
OpenSim/Framework/RegionSettings.cs
View File

@ -44,10 +44,16 @@ namespace OpenSim.Framework
public RegionSettings() public RegionSettings()
{ {
if (configMember == null) if (configMember == null)
{
try
{ {
configMember = new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS", LoadConfigurationOptions, HandleIncomingConfiguration, true); configMember = new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS", LoadConfigurationOptions, HandleIncomingConfiguration, true);
configMember.performConfigurationRetrieve(); configMember.performConfigurationRetrieve();
} }
catch (Exception e)
{
}
}
} }
public void LoadConfigurationOptions() public void LoadConfigurationOptions()