diff options
author | Adam Frisby | 2007-10-22 21:57:32 +0000 |
---|---|---|
committer | Adam Frisby | 2007-10-22 21:57:32 +0000 |
commit | 5dad0ed7296b4abfe2c934a8404022a4d2189051 (patch) | |
tree | a1151b7ba2e093e947034b40ad10b8614137cf05 /OpenSim/Region/Application | |
parent | * Made EstateSetting static since there's only one instance, and we only need... (diff) | |
download | opensim-SC_OLD-5dad0ed7296b4abfe2c934a8404022a4d2189051.zip opensim-SC_OLD-5dad0ed7296b4abfe2c934a8404022a4d2189051.tar.gz opensim-SC_OLD-5dad0ed7296b4abfe2c934a8404022a4d2189051.tar.bz2 opensim-SC_OLD-5dad0ed7296b4abfe2c934a8404022a4d2189051.tar.xz |
* Return of R2162. /Take that SVN!/
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index d2f5648..9de3831 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -262,8 +262,10 @@ namespace OpenSim | |||
262 | } | 262 | } |
263 | else | 263 | else |
264 | { | 264 | { |
265 | MainLog.Instance.Verbose("No startup command script specified. Moving on..."); | 265 | MainLog.Instance.Verbose("STARTUP","No startup command script specified. Moving on..."); |
266 | } | 266 | } |
267 | |||
268 | MainLog.Instance.Status("STARTUP","Startup complete, serving " + m_udpServers.Count.ToString() + " region(s)"); | ||
267 | } | 269 | } |
268 | 270 | ||
269 | private static void CreateDefaultRegionInfoXml(string fileName) | 271 | private static void CreateDefaultRegionInfoXml(string fileName) |
@@ -361,11 +363,11 @@ namespace OpenSim | |||
361 | RunCommandScript(m_shutdownCommandsFile); | 363 | RunCommandScript(m_shutdownCommandsFile); |
362 | } | 364 | } |
363 | 365 | ||
364 | m_log.Verbose("Closing all threads"); | 366 | m_log.Verbose("SHUTDOWN", "Closing all threads"); |
365 | m_log.Verbose("Killing listener thread"); | 367 | m_log.Verbose("SHUTDOWN", "Killing listener thread"); |
366 | m_log.Verbose("Killing clients"); | 368 | m_log.Verbose("SHUTDOWN", "Killing clients"); |
367 | // IMPLEMENT THIS | 369 | // IMPLEMENT THIS |
368 | m_log.Verbose("Closing console and terminating"); | 370 | m_log.Verbose("SHUTDOWN", "Closing console and terminating"); |
369 | 371 | ||
370 | m_sceneManager.Close(); | 372 | m_sceneManager.Close(); |
371 | 373 | ||
@@ -380,7 +382,7 @@ namespace OpenSim | |||
380 | /// <param name="fileName"></param> | 382 | /// <param name="fileName"></param> |
381 | private void RunCommandScript(string fileName) | 383 | private void RunCommandScript(string fileName) |
382 | { | 384 | { |
383 | MainLog.Instance.Verbose("Running command script (" + fileName + ")"); | 385 | MainLog.Instance.Verbose("COMMANDFILE", "Running " + fileName); |
384 | if (File.Exists(fileName)) | 386 | if (File.Exists(fileName)) |
385 | { | 387 | { |
386 | StreamReader readFile = File.OpenText(fileName); | 388 | StreamReader readFile = File.OpenText(fileName); |
@@ -389,14 +391,14 @@ namespace OpenSim | |||
389 | { | 391 | { |
390 | if (currentCommand != "") | 392 | if (currentCommand != "") |
391 | { | 393 | { |
392 | MainLog.Instance.Verbose("Running '" + currentCommand + "'"); | 394 | MainLog.Instance.Verbose("COMMANDFILE", "Running '" + currentCommand + "'"); |
393 | MainLog.Instance.MainLogRunCommand(currentCommand); | 395 | MainLog.Instance.MainLogRunCommand(currentCommand); |
394 | } | 396 | } |
395 | } | 397 | } |
396 | } | 398 | } |
397 | else | 399 | else |
398 | { | 400 | { |
399 | MainLog.Instance.Error("Command script missing. Can not run commands"); | 401 | MainLog.Instance.Error("COMMANDFILE","Command script missing. Can not run commands"); |
400 | } | 402 | } |
401 | } | 403 | } |
402 | 404 | ||