ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 19:36:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source
This commit is contained in:
Melanie
2013-03-01 23:54:00 +00:00
parent eb9458fd7e 20530ee667
commit a675f7d4c3
14 changed files with 246 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Server/Base/ServicesServerBase.cs
View File

@@ -186,6 +186,10 @@ namespace OpenSim.Server.Base
XmlConfigurator.Configure();
}
// FIXME: This should be done down in ServerBase but we need to sort out and refactor the log4net
// XmlConfigurator calls first accross servers.
m_log.InfoFormat("[SERVER BASE]: Starting in {0}", m_startupDirectory);
RegisterCommonAppenders(startupConfig);
if (startupConfig.GetString("PIDFile", String.Empty) != String.Empty)