From 94558603e57a74375db0695a4565a534cfed3abe Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sat, 11 Oct 2008 15:41:25 +0000
Subject: Make a missing or read-only estate_settings.xml non-fatal

---
 OpenSim/Framework/EstateSettings.cs | 26 ++++++++++++++++----------
 OpenSim/Framework/RegionSettings.cs | 10 ++++++++--
 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
         {
             if (configMember == null)
             {
-                // Load legacy defaults
-                //
-                configMember =
-                    new ConfigurationMember(Path.Combine(Util.configDir(),
-                            "estate_settings.xml"), "ESTATE SETTINGS",
-                            loadConfigurationOptions,
-                            handleIncomingConfiguration, true);
-
-                l_EstateManagers.Clear();
-                configMember.performConfigurationRetrieve();
+                try
+                {
+                    // Load legacy defaults
+                    //
+                    configMember =
+                        new ConfigurationMember(Path.Combine(Util.configDir(),
+                                "estate_settings.xml"), "ESTATE SETTINGS",
+                                loadConfigurationOptions,
+                                handleIncomingConfiguration, true);
+
+                    l_EstateManagers.Clear();
+                    configMember.performConfigurationRetrieve();
+                }
+                catch (Exception e)
+                {
+                }
             }
         }
 
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
         {
             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)
+                {
+                }
             }
         }
 
-- 
cgit v1.1