5 files changed, 48 insertions, 3 deletions

diff --git a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
index 72faed6..ffb24ff 100644
--- a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
+++ b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
@@ -31,6 +31,7 @@ using System.Xml;
 
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Configuration.Interfaces;
+using OpenSim.Framework.Utilities;
 
 namespace OpenSim.Framework.Configuration
 {
@@ -119,6 +120,11 @@ namespace OpenSim.Framework.Configuration
 
         public void Commit()
         {
+            if (!Directory.Exists(Util.configDir()))
+            {
+                Directory.CreateDirectory(Util.configDir());
+            }
+ 
             doc.Save(fileName);
         }
 
diff --git a/OpenSim/Framework/Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs
index a088af8..a090377 100644
--- a/OpenSim/Framework/Console/LogBase.cs
+++ b/OpenSim/Framework/Console/LogBase.cs
@@ -63,6 +63,7 @@ namespace OpenSim.Framework.Console
             }
 
             System.Console.WriteLine("Logs will be saved to current directory in " + LogFile);
+           
             Log = File.AppendText(LogFile);
             Log.WriteLine("========================================================================");
             Log.WriteLine(componentname + " Started at " + DateTime.Now.ToString());
diff --git a/OpenSim/Framework/Data.DB4o/DB4oUserData.cs b/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
index 1a3bcb9..ef4211e 100644
--- a/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
@@ -26,7 +26,9 @@
 * 
 */
 using System;
+using System.IO;
 using libsecondlife;
+using OpenSim.Framework.Utilities;
 
 namespace OpenSim.Framework.Data.DB4o
 {
@@ -45,7 +47,7 @@ namespace OpenSim.Framework.Data.DB4o
         /// </summary>
         public void Initialise()
         {
-            manager = new DB4oUserManager("userprofiles.yap");
+            manager = new DB4oUserManager(Path.Combine(Util.dataDir(),"userprofiles.yap"));
         }
 
         /// <summary>
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()
         {