2 files changed, 2 insertions, 7 deletions

diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 176e876..1484ee0 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Server.Base
             string fileName = "";
             if (Assembly.GetEntryAssembly() != null)
                 fileName = Path.GetFileNameWithoutExtension(Assembly.GetEntryAssembly().Location);
-            string iniFile = fileName + ".ini";
+            string iniFile = Util.configDir() + fileName + ".ini";
             string logConfig = null;
 
             IConfig startupConfig = argvConfig.Configs["Startup"];
diff --git a/OpenSim/Server/Handlers/BakedTextures/XBakes.cs b/OpenSim/Server/Handlers/BakedTextures/XBakes.cs
index 4e55433..0c74564 100644
--- a/OpenSim/Server/Handlers/BakedTextures/XBakes.cs
+++ b/OpenSim/Server/Handlers/BakedTextures/XBakes.cs
@@ -67,12 +67,7 @@ namespace OpenSim.Server.Handlers.BakedTextures
                 throw new Exception("No BakedTextureService configuration");
             }
 
-            m_FSBase = assetConfig.GetString("BaseDirectory", String.Empty);
-            if (m_FSBase == String.Empty)
-            {
-                m_log.ErrorFormat("[BAKES]: BaseDirectory not specified");
-                throw new Exception("Configuration error");
-            }
+            m_FSBase = assetConfig.GetString("BaseDirectory", Util.cacheDir() + "/bakes");
 
             m_log.Info("[BAKES]: XBakes service enabled");
         }