aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionSettings.cs
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-11 15:41:25 +0000
committerMelanie Thielker2008-10-11 15:41:25 +0000
commit94558603e57a74375db0695a4565a534cfed3abe (patch)
tree63f00049f1a76518126359aa9c3bb482d99ae32a /OpenSim/Framework/RegionSettings.cs
parent* Rework llParcelMediaCommandList (diff)
downloadopensim-SC_OLD-94558603e57a74375db0695a4565a534cfed3abe.zip
opensim-SC_OLD-94558603e57a74375db0695a4565a534cfed3abe.tar.gz
opensim-SC_OLD-94558603e57a74375db0695a4565a534cfed3abe.tar.bz2
opensim-SC_OLD-94558603e57a74375db0695a4565a534cfed3abe.tar.xz
Make a missing or read-only estate_settings.xml non-fatal
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/RegionSettings.cs10
1 files changed, 8 insertions, 2 deletions
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