diff options
author | Sean Dague | 2007-10-22 15:37:54 +0000 |
---|---|---|
committer | Sean Dague | 2007-10-22 15:37:54 +0000 |
commit | 6acaabefc32525aed7ded45fc15e6152895d5382 (patch) | |
tree | 1350ddbde54e72c8d96719580a416cc2f0d85d24 /OpenSim/Region/Application/OpenSimMain.cs | |
parent | * Major ass commit. (diff) | |
download | opensim-SC-6acaabefc32525aed7ded45fc15e6152895d5382.zip opensim-SC-6acaabefc32525aed7ded45fc15e6152895d5382.tar.gz opensim-SC-6acaabefc32525aed7ded45fc15e6152895d5382.tar.bz2 opensim-SC-6acaabefc32525aed7ded45fc15e6152895d5382.tar.xz |
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.
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMain.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 18 |
1 files changed, 8 insertions, 10 deletions
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 | |||
262 | } | 262 | } |
263 | else | 263 | else |
264 | { | 264 | { |
265 | MainLog.Instance.Verbose("STARTUP","No startup command script specified. Moving on..."); | 265 | MainLog.Instance.Verbose("No startup command script specified. Moving on..."); |
266 | } | 266 | } |
267 | |||
268 | MainLog.Instance.Status("STARTUP","Startup complete, serving " + m_udpServers.Count.ToString() + " region(s)"); | ||
269 | } | 267 | } |
270 | 268 | ||
271 | private static void CreateDefaultRegionInfoXml(string fileName) | 269 | private static void CreateDefaultRegionInfoXml(string fileName) |
@@ -363,11 +361,11 @@ namespace OpenSim | |||
363 | RunCommandScript(m_shutdownCommandsFile); | 361 | RunCommandScript(m_shutdownCommandsFile); |
364 | } | 362 | } |
365 | 363 | ||
366 | m_log.Verbose("SHUTDOWN", "Closing all threads"); | 364 | m_log.Verbose("Closing all threads"); |
367 | m_log.Verbose("SHUTDOWN", "Killing listener thread"); | 365 | m_log.Verbose("Killing listener thread"); |
368 | m_log.Verbose("SHUTDOWN", "Killing clients"); | 366 | m_log.Verbose("Killing clients"); |
369 | // IMPLEMENT THIS | 367 | // IMPLEMENT THIS |
370 | m_log.Verbose("SHUTDOWN", "Closing console and terminating"); | 368 | m_log.Verbose("Closing console and terminating"); |
371 | 369 | ||
372 | m_sceneManager.Close(); | 370 | m_sceneManager.Close(); |
373 | 371 | ||
@@ -382,7 +380,7 @@ namespace OpenSim | |||
382 | /// <param name="fileName"></param> | 380 | /// <param name="fileName"></param> |
383 | private void RunCommandScript(string fileName) | 381 | private void RunCommandScript(string fileName) |
384 | { | 382 | { |
385 | MainLog.Instance.Verbose("COMMANDFILE", "Running " + fileName); | 383 | MainLog.Instance.Verbose("Running command script (" + fileName + ")"); |
386 | if (File.Exists(fileName)) | 384 | if (File.Exists(fileName)) |
387 | { | 385 | { |
388 | StreamReader readFile = File.OpenText(fileName); | 386 | StreamReader readFile = File.OpenText(fileName); |
@@ -391,14 +389,14 @@ namespace OpenSim | |||
391 | { | 389 | { |
392 | if (currentCommand != "") | 390 | if (currentCommand != "") |
393 | { | 391 | { |
394 | MainLog.Instance.Verbose("COMMANDFILE", "Running '" + currentCommand + "'"); | 392 | MainLog.Instance.Verbose("Running '" + currentCommand + "'"); |
395 | MainLog.Instance.MainLogRunCommand(currentCommand); | 393 | MainLog.Instance.MainLogRunCommand(currentCommand); |
396 | } | 394 | } |
397 | } | 395 | } |
398 | } | 396 | } |
399 | else | 397 | else |
400 | { | 398 | { |
401 | MainLog.Instance.Error("COMMANDFILE","Command script missing. Can not run commands"); | 399 | MainLog.Instance.Error("Command script missing. Can not run commands"); |
402 | } | 400 | } |
403 | } | 401 | } |
404 | 402 | ||