aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-03-17 19:08:23 +0000
committerJustin Clarke Casey2008-03-17 19:08:23 +0000
commit37c32e1154f04b932db96cbd1cd8d08a5e66ff6d (patch)
treef4dc18df0f4d9ec755f236bd61569a49581f8467 /OpenSim/Region/Application
parent* DEV: Remove client's CAPS handlers object when they log out (diff)
downloadopensim-SC_OLD-37c32e1154f04b932db96cbd1cd8d08a5e66ff6d.zip
opensim-SC_OLD-37c32e1154f04b932db96cbd1cd8d08a5e66ff6d.tar.gz
opensim-SC_OLD-37c32e1154f04b932db96cbd1cd8d08a5e66ff6d.tar.bz2
opensim-SC_OLD-37c32e1154f04b932db96cbd1cd8d08a5e66ff6d.tar.xz
* Make it more obvious if local user services are being used
* Tell the log whether the sim is started in standalone or grid mode
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 1b8ed45..6522a5a 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -315,6 +315,7 @@ namespace OpenSim
315 m_log.Info("===================================================================="); 315 m_log.Info("====================================================================");
316 m_log.Info("========================= STARTING OPENSIM ========================="); 316 m_log.Info("========================= STARTING OPENSIM =========================");
317 m_log.Info("===================================================================="); 317 m_log.Info("====================================================================");
318 m_log.InfoFormat("[OPENSIM MAIN]: Running in {0} mode", (m_sandbox ? "sandbox" : "grid"));
318 319
319 m_console = CreateConsole(); 320 m_console = CreateConsole();
320 MainConsole.Instance = m_console; 321 MainConsole.Instance = m_console;
@@ -409,7 +410,7 @@ namespace OpenSim
409 410
410 // We are done with startup 411 // We are done with startup
411 PrintFileToConsole("startuplogo.txt"); 412 PrintFileToConsole("startuplogo.txt");
412 m_log.Info("[STARTUP]: Startup complete, serving " + m_udpServers.Count.ToString() + " region(s)"); 413 m_log.Info("[OPENSIM MAIN]: Startup complete, serving " + m_udpServers.Count.ToString() + " region(s)");
413 } 414 }
414 415
415 protected override void Initialize() 416 protected override void Initialize()
@@ -532,7 +533,7 @@ namespace OpenSim
532 533
533 public void handleRestartRegion(RegionInfo whichRegion) 534 public void handleRestartRegion(RegionInfo whichRegion)
534 { 535 {
535 m_log.Error("[MAIN]: Got restart signal from SceneManager"); 536 m_log.Error("[OPENSIM MAIN]: Got restart signal from SceneManager");
536 // Shutting down the UDP server 537 // Shutting down the UDP server
537 bool foundUDPServer = false; 538 bool foundUDPServer = false;
538 int UDPServerElement = 0; 539 int UDPServerElement = 0;