diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index c0dc907ddc..035b3ad180 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -133,17 +133,7 @@ namespace OpenSim.Framework.Servers
/// Performs initialisation of the scene, such as loading configuration from disk.
///
public virtual void Startup()
- {
- m_log.Info("[STARTUP]: Beginning startup processing");
-
- m_log.Info("[STARTUP]: OpenSimulator version: " + m_version + Environment.NewLine);
- // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and
- // the clr version number doesn't match the project version number under Mono.
- //m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine);
- m_log.InfoFormat(
- "[STARTUP]: Operating system version: {0}, .NET platform {1}, {2}-bit\n",
- Environment.OSVersion, Environment.OSVersion.Platform, Util.Is64BitProcess() ? "64" : "32");
-
+ {
StartupSpecific();
TimeSpan timeTaken = DateTime.Now - m_startuptime;
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index 47baac8022..657444ca60 100644
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -113,6 +113,26 @@ namespace OpenSim.Framework.Servers
}
}
+ ///
+ /// Log information about the circumstances in which we're running (OpenSimulator version number, CLR details,
+ /// etc.).
+ ///
+ public void LogEnvironmentInformation()
+ {
+ // 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);
+
+ m_log.InfoFormat("[SERVER BASE]: OpenSimulator version: {0}", m_version);
+
+ // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and
+ // the clr version number doesn't match the project version number under Mono.
+ //m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine);
+ m_log.InfoFormat(
+ "[SERVER BASE]: Operating system version: {0}, .NET platform {1}, {2}-bit",
+ Environment.OSVersion, Environment.OSVersion.Platform, Util.Is64BitProcess() ? "64" : "32");
+ }
+
public void RegisterCommonAppenders(IConfig startupConfig)
{
ILoggerRepository repository = LogManager.GetRepository();
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 06487f283e..7c46a7bfdc 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -159,6 +159,7 @@ namespace OpenSim
MainConsole.Instance = m_console;
+ LogEnvironmentInformation();
RegisterCommonAppenders(Config.Configs["Startup"]);
RegisterConsoleCommands();
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index f850913c67..2927f1fccf 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -142,10 +142,6 @@ namespace OpenSim
///
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);
}
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 82f4596571..e5a1c57442 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -178,10 +178,7 @@ 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);
-
+ LogEnvironmentInformation();
RegisterCommonAppenders(startupConfig);
if (startupConfig.GetString("PIDFile", String.Empty) != String.Empty)