From 6acaabefc32525aed7ded45fc15e6152895d5382 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Mon, 22 Oct 2007 15:37:54 +0000 Subject: revert r2162 as it completely clobbered all the work on the ChatModule by MW and myself. Couldn't find Adam online after that rev went in. --- OpenSim/Region/Application/OpenSimMain.cs | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'OpenSim/Region/Application/OpenSimMain.cs') diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 9de3831..d2f5648 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs @@ -262,10 +262,8 @@ namespace OpenSim } else { - MainLog.Instance.Verbose("STARTUP","No startup command script specified. Moving on..."); + MainLog.Instance.Verbose("No startup command script specified. Moving on..."); } - - MainLog.Instance.Status("STARTUP","Startup complete, serving " + m_udpServers.Count.ToString() + " region(s)"); } private static void CreateDefaultRegionInfoXml(string fileName) @@ -363,11 +361,11 @@ namespace OpenSim RunCommandScript(m_shutdownCommandsFile); } - m_log.Verbose("SHUTDOWN", "Closing all threads"); - m_log.Verbose("SHUTDOWN", "Killing listener thread"); - m_log.Verbose("SHUTDOWN", "Killing clients"); + m_log.Verbose("Closing all threads"); + m_log.Verbose("Killing listener thread"); + m_log.Verbose("Killing clients"); // IMPLEMENT THIS - m_log.Verbose("SHUTDOWN", "Closing console and terminating"); + m_log.Verbose("Closing console and terminating"); m_sceneManager.Close(); @@ -382,7 +380,7 @@ namespace OpenSim /// private void RunCommandScript(string fileName) { - MainLog.Instance.Verbose("COMMANDFILE", "Running " + fileName); + MainLog.Instance.Verbose("Running command script (" + fileName + ")"); if (File.Exists(fileName)) { StreamReader readFile = File.OpenText(fileName); @@ -391,14 +389,14 @@ namespace OpenSim { if (currentCommand != "") { - MainLog.Instance.Verbose("COMMANDFILE", "Running '" + currentCommand + "'"); + MainLog.Instance.Verbose("Running '" + currentCommand + "'"); MainLog.Instance.MainLogRunCommand(currentCommand); } } } else { - MainLog.Instance.Error("COMMANDFILE","Command script missing. Can not run commands"); + MainLog.Instance.Error("Command script missing. Can not run commands"); } } -- cgit v1.1