Merge branch 'master' into careminster

1 files changed, 9 insertions, 1 deletions

diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 5b23149..ecd69b0 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -56,6 +56,12 @@ namespace OpenSim.Server.Base
         //
         protected string[] m_Arguments;
 
+        public string ConfigDirectory
+        {
+            get;
+            private set;
+        }
+
         // Run flag
         //
         private bool m_Running = true;
@@ -134,6 +140,8 @@ namespace OpenSim.Server.Base
                 startupConfig = Config.Configs["Startup"];
             }
 
+            ConfigDirectory = startupConfig.GetString("ConfigDirectory", ".");
+
             prompt = startupConfig.GetString("Prompt", prompt);
 
             // Allow derived classes to load config before the console is
@@ -242,4 +250,4 @@ namespace OpenSim.Server.Base
         {
         }
     }
-}
\ No newline at end of file
+}