Merge branch 'master' into careminster

This commit is contained in:
Melanie
2013-03-01 23:54:00 +00:00
14 changed files with 246 additions and 197 deletions

View File

@@ -138,6 +138,10 @@ namespace OpenSim
/// <param name="configSource"></param>
public OpenSimBase(IConfigSource configSource) : base()
{
// 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);
LoadConfigSettings(configSource);
}