diff options
| author | Melanie | 2013-03-01 23:54:00 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-01 23:54:00 +0000 |
| commit | a675f7d4c3af4550263985aafcefd11458f6d365 (patch) | |
| tree | 6966e1d313f402a1de65efee535de493d648b4aa /OpenSim/Server | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Moved permissions config vars out of [Startup] into [Permissions]. Backwards ... (diff) | |
| download | opensim-SC-a675f7d4c3af4550263985aafcefd11458f6d365.zip opensim-SC-a675f7d4c3af4550263985aafcefd11458f6d365.tar.gz opensim-SC-a675f7d4c3af4550263985aafcefd11458f6d365.tar.bz2 opensim-SC-a675f7d4c3af4550263985aafcefd11458f6d365.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Server')
| -rw-r--r-- | OpenSim/Server/Base/ServicesServerBase.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs index ecd69b0..5aff72a 100644 --- a/OpenSim/Server/Base/ServicesServerBase.cs +++ b/OpenSim/Server/Base/ServicesServerBase.cs | |||
| @@ -186,6 +186,10 @@ namespace OpenSim.Server.Base | |||
| 186 | XmlConfigurator.Configure(); | 186 | XmlConfigurator.Configure(); |
| 187 | } | 187 | } |
| 188 | 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 | |||
| 189 | RegisterCommonAppenders(startupConfig); | 193 | RegisterCommonAppenders(startupConfig); |
| 190 | 194 | ||
| 191 | if (startupConfig.GetString("PIDFile", String.Empty) != String.Empty) | 195 | if (startupConfig.GetString("PIDFile", String.Empty) != String.Empty) |