Changes to prepare for future possible configuration of separate logdir, configdir, datadir.

2 files changed, 38 insertions, 2 deletions

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();
         }
 
diff --git a/OpenSim/Framework/General/Util.cs b/OpenSim/Framework/General/Util.cs
index b9f8e9c..f3e2a01 100644
--- a/OpenSim/Framework/General/Util.cs
+++ b/OpenSim/Framework/General/Util.cs
@@ -26,6 +26,7 @@
 * 
 */
 using System;
+using System.IO;
 using System.Security.Cryptography;
 using System.Net;
 using System.Text;
@@ -275,6 +276,39 @@ namespace OpenSim.Framework.Utilities
             return null;
         }
 
+        //
+        // directory locations
+        //
+        public static string homeDir()
+        {
+            string temp;
+//            string personal=(Environment.GetFolderPath(Environment.SpecialFolder.Personal));
+//            temp = Path.Combine(personal,".OpenSim");
+            temp=".";
+            return temp;
+        }
+
+        public static string configDir()
+        {
+            string temp;
+            temp = ".";
+            return temp;
+        }
+
+        public static string dataDir()
+        {
+            string temp;
+            temp = ".";
+            return temp;
+        }
+
+        public static string logDir()
+        {
+            string temp;
+            temp = ".";
+            return temp;
+        }
+
         public Util()
         {