From 6acaabefc32525aed7ded45fc15e6152895d5382 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Mon, 22 Oct 2007 15:37:54 +0000
Subject: revert r2162 as it completely clobbered all the work on the
 ChatModule by MW and myself.  Couldn't find Adam online after that rev went
 in.

---
 OpenSim/Framework/General/Types/EstateSettings.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Framework/General/Types/EstateSettings.cs')

diff --git a/OpenSim/Framework/General/Types/EstateSettings.cs b/OpenSim/Framework/General/Types/EstateSettings.cs
index 2675e52..abdcf6f 100644
--- a/OpenSim/Framework/General/Types/EstateSettings.cs
+++ b/OpenSim/Framework/General/Types/EstateSettings.cs
@@ -557,12 +557,8 @@ namespace OpenSim.Framework.Types
         private ConfigurationMember configMember;
         public EstateSettings()
         {
-            // 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();
-            }
+            configMember = new ConfigurationMember(Path.Combine(Util.configDir(),"estate_settings.xml"), "ESTATE SETTINGS", this.loadConfigurationOptions, this.handleIncomingConfiguration);
+            configMember.performConfigurationRetrieve();
         }
 
         public void loadConfigurationOptions()
-- 
cgit v1.1