diff options
Diffstat (limited to 'OpenSim/Server/Base/ServicesServerBase.cs')
-rw-r--r-- | OpenSim/Server/Base/ServicesServerBase.cs | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs index 5b23149..5aff72a 100644 --- a/OpenSim/Server/Base/ServicesServerBase.cs +++ b/OpenSim/Server/Base/ServicesServerBase.cs | |||
@@ -56,6 +56,12 @@ namespace OpenSim.Server.Base | |||
56 | // | 56 | // |
57 | protected string[] m_Arguments; | 57 | protected string[] m_Arguments; |
58 | 58 | ||
59 | public string ConfigDirectory | ||
60 | { | ||
61 | get; | ||
62 | private set; | ||
63 | } | ||
64 | |||
59 | // Run flag | 65 | // Run flag |
60 | // | 66 | // |
61 | private bool m_Running = true; | 67 | private bool m_Running = true; |
@@ -134,6 +140,8 @@ namespace OpenSim.Server.Base | |||
134 | startupConfig = Config.Configs["Startup"]; | 140 | startupConfig = Config.Configs["Startup"]; |
135 | } | 141 | } |
136 | 142 | ||
143 | ConfigDirectory = startupConfig.GetString("ConfigDirectory", "."); | ||
144 | |||
137 | prompt = startupConfig.GetString("Prompt", prompt); | 145 | prompt = startupConfig.GetString("Prompt", prompt); |
138 | 146 | ||
139 | // Allow derived classes to load config before the console is | 147 | // Allow derived classes to load config before the console is |
@@ -178,6 +186,10 @@ namespace OpenSim.Server.Base | |||
178 | XmlConfigurator.Configure(); | 186 | XmlConfigurator.Configure(); |
179 | } | 187 | } |
180 | 188 | ||
189 | // FIXME: This should be done down in ServerBase but we need to sort out and refactor the log4net | ||
190 | // XmlConfigurator calls first accross servers. | ||
191 | m_log.InfoFormat("[SERVER BASE]: Starting in {0}", m_startupDirectory); | ||
192 | |||
181 | RegisterCommonAppenders(startupConfig); | 193 | RegisterCommonAppenders(startupConfig); |
182 | 194 | ||
183 | if (startupConfig.GetString("PIDFile", String.Empty) != String.Empty) | 195 | if (startupConfig.GetString("PIDFile", String.Empty) != String.Empty) |
@@ -242,4 +254,4 @@ namespace OpenSim.Server.Base | |||
242 | { | 254 | { |
243 | } | 255 | } |
244 | } | 256 | } |
245 | } \ No newline at end of file | 257 | } |