1 files changed, 6 insertions, 2 deletions

diff --git a/OpenSim/Framework/General/Types/EstateSettings.cs b/OpenSim/Framework/General/Types/EstateSettings.cs
index abdcf6f..2675e52 100644
--- a/OpenSim/Framework/General/Types/EstateSettings.cs
+++ b/OpenSim/Framework/General/Types/EstateSettings.cs
@@ -557,8 +557,12 @@ namespace OpenSim.Framework.Types
         private ConfigurationMember configMember;
         public EstateSettings()
         {
-            configMember = new ConfigurationMember(Path.Combine(Util.configDir(),"estate_settings.xml"), "ESTATE SETTINGS", this.loadConfigurationOptions, this.handleIncomingConfiguration);
-            configMember.performConfigurationRetrieve();
+            // Temporary hack to prevent multiple loadings.
+            if (configMember == null)
+            {
+                configMember = new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS", this.loadConfigurationOptions, this.handleIncomingConfiguration);
+                configMember.performConfigurationRetrieve();
+            }
         }
 
         public void loadConfigurationOptions()