aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/EstateSettings.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/EstateSettings.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 'OpenSim/Framework/EstateSettings.cs')
-rw-r--r--OpenSim/Framework/EstateSettings.cs26
1 files changed, 16 insertions, 10 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