diff options
author | Justin Clarke Casey | 2008-03-17 19:08:23 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-03-17 19:08:23 +0000 |
commit | 37c32e1154f04b932db96cbd1cd8d08a5e66ff6d (patch) | |
tree | f4dc18df0f4d9ec755f236bd61569a49581f8467 /OpenSim/Region | |
parent | * DEV: Remove client's CAPS handlers object when they log out (diff) | |
download | opensim-SC-37c32e1154f04b932db96cbd1cd8d08a5e66ff6d.zip opensim-SC-37c32e1154f04b932db96cbd1cd8d08a5e66ff6d.tar.gz opensim-SC-37c32e1154f04b932db96cbd1cd8d08a5e66ff6d.tar.bz2 opensim-SC-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 '')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Communications/Local/LocalUserServices.cs | 5 |
2 files changed, 5 insertions, 5 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; |
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs index 9f936d8..eb1bf94 100644 --- a/OpenSim/Region/Communications/Local/LocalUserServices.cs +++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs | |||
@@ -42,7 +42,6 @@ namespace OpenSim.Region.Communications.Local | |||
42 | private readonly uint m_defaultHomeY; | 42 | private readonly uint m_defaultHomeY; |
43 | private IInventoryServices m_inventoryService; | 43 | private IInventoryServices m_inventoryService; |
44 | 44 | ||
45 | |||
46 | /// <summary> | 45 | /// <summary> |
47 | /// | 46 | /// |
48 | /// </summary> | 47 | /// </summary> |
@@ -82,7 +81,7 @@ namespace OpenSim.Region.Communications.Local | |||
82 | 81 | ||
83 | if (profile == null) | 82 | if (profile == null) |
84 | { | 83 | { |
85 | Console.WriteLine("Unknown Master User after creation attempt. No clue what to do here."); | 84 | Console.WriteLine("[LOCAL USER SERVICES]: Unknown Master User after creation attempt. No clue what to do here."); |
86 | } | 85 | } |
87 | else | 86 | else |
88 | { | 87 | { |
@@ -97,7 +96,7 @@ namespace OpenSim.Region.Communications.Local | |||
97 | UserProfileData data = GetUserProfile(uuid); | 96 | UserProfileData data = GetUserProfile(uuid); |
98 | if (data == null) | 97 | if (data == null) |
99 | { | 98 | { |
100 | throw new Exception("Unknown master user UUID. Possible reason: UserServer is not running."); | 99 | throw new Exception("[LOCAL USER SERVICES]: Unknown master user UUID. Possible reason: UserServer is not running."); |
101 | } | 100 | } |
102 | return data; | 101 | return data; |
103 | } | 102 | } |