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

revert r2162 as it completely clobbered all the work on

Browse Source 
the ChatModule by MW and myself.  Couldn't find Adam online
after that rev went in.
This commit is contained in:
Sean Dague
2007-10-22 15:37:54 +00:00
parent c4707a284f
commit 6acaabefc3
18 changed files with 500 additions and 573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/Application/OpenSimMain.cs
View File

@@ -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
/// <param name="fileName"></param>
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");
}
}