diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index 74e64e3f36..5d8e5b963a 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -48,13 +48,6 @@ namespace OpenSim.Framework.Console
{
m_componentName = componentname;
m_cmdParser = cmdparser;
-
- m_log.Info("[" + m_componentName + "]: Started at " + DateTime.Now.ToString());
- }
-
- public void Close()
- {
- m_log.Info("[" + m_componentName + "]: Shutdown at " + DateTime.Now.ToString());
}
///
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index dfc9c0a2b9..f8e97b1567 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -74,21 +74,20 @@ 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");
+
EnhanceVersionInformation();
m_log.Info("[STARTUP]: Version " + m_version + "\n");
}
///
- /// Should be overriden by descendents if they need to perform extra shutdown processing
+ /// Should be overriden and referenced by descendents if they need to perform extra shutdown processing
///
public virtual void Shutdown()
- {
- if (m_console != null)
- {
- m_console.Close();
- }
+ {
+ m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete. Exiting...");
Environment.Exit(0);
}
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index a118a90859..7053f72cb3 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -60,8 +60,6 @@ namespace OpenSim.Grid.AssetServer
{
XmlConfigurator.Configure();
- m_log.Info("Starting...\n");
-
assetserver = new OpenAsset_Main();
assetserver.Startup();
@@ -175,18 +173,5 @@ namespace OpenSim.Grid.AssetServer
{
m_assetProvider.CreateAsset(asset);
}
-
- public override void RunCmd(string cmd, string[] cmdparams)
- {
- base.RunCmd(cmd, cmdparams);
-
- switch (cmd)
- {
- case "shutdown":
- m_console.Close();
- Environment.Exit(0);
- break;
- }
- }
}
}
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 9be30e9b5d..32dff0fa3a 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -58,8 +58,6 @@ namespace OpenSim
Console.WriteLine(" Environment is unsupported (" + supported + ")\n");
}
- Console.WriteLine("Starting...\n");
-
Culture.SetCurrentCulture();
ArgvConfigSource configSource = new ArgvConfigSource(args);