From 599a6d32eebc451f9284db8e6abf2946f236d5e9 Mon Sep 17 00:00:00 2001
From: Brian McBee
Date: Fri, 3 Aug 2007 18:01:55 +0000
Subject: Changes to prepare for future possible configuration of separate
 logdir, configdir, datadir.

---
 OpenSim/Framework/General/Types/EstateSettings.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 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 11594fd..ae61752 100644
--- a/OpenSim/Framework/General/Types/EstateSettings.cs
+++ b/OpenSim/Framework/General/Types/EstateSettings.cs
@@ -25,9 +25,11 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-
+using System.IO;
 using libsecondlife;
 using OpenSim.Framework.Configuration;
+using OpenSim.Framework.Utilities;
+
 namespace OpenSim.Framework.Types
 {
     public class EstateSettings
@@ -554,7 +556,7 @@ namespace OpenSim.Framework.Types
         private ConfigurationMember configMember;
         public EstateSettings()
         {
-            configMember = new ConfigurationMember("estate_settings.xml", "ESTATE SETTINGS", this.loadConfigurationOptions, this.handleIncomingConfiguration);
+            configMember = new ConfigurationMember(Path.Combine(Util.configDir(),"estate_settings.xml"), "ESTATE SETTINGS", this.loadConfigurationOptions, this.handleIncomingConfiguration);
             configMember.performConfigurationRetrieve();
         }
 
-- 
cgit v1.1