* Make it more obvious if local user services are being used
* Tell the log whether the sim is started in standalone or grid mode0.6.0-stable
parent
d137d4b907
commit
37c32e1154
|
@ -315,6 +315,7 @@ namespace OpenSim
|
|||
m_log.Info("====================================================================");
|
||||
m_log.Info("========================= STARTING OPENSIM =========================");
|
||||
m_log.Info("====================================================================");
|
||||
m_log.InfoFormat("[OPENSIM MAIN]: Running in {0} mode", (m_sandbox ? "sandbox" : "grid"));
|
||||
|
||||
m_console = CreateConsole();
|
||||
MainConsole.Instance = m_console;
|
||||
|
@ -409,7 +410,7 @@ namespace OpenSim
|
|||
|
||||
// We are done with startup
|
||||
PrintFileToConsole("startuplogo.txt");
|
||||
m_log.Info("[STARTUP]: Startup complete, serving " + m_udpServers.Count.ToString() + " region(s)");
|
||||
m_log.Info("[OPENSIM MAIN]: Startup complete, serving " + m_udpServers.Count.ToString() + " region(s)");
|
||||
}
|
||||
|
||||
protected override void Initialize()
|
||||
|
@ -532,7 +533,7 @@ namespace OpenSim
|
|||
|
||||
public void handleRestartRegion(RegionInfo whichRegion)
|
||||
{
|
||||
m_log.Error("[MAIN]: Got restart signal from SceneManager");
|
||||
m_log.Error("[OPENSIM MAIN]: Got restart signal from SceneManager");
|
||||
// Shutting down the UDP server
|
||||
bool foundUDPServer = false;
|
||||
int UDPServerElement = 0;
|
||||
|
|
|
@ -42,7 +42,6 @@ namespace OpenSim.Region.Communications.Local
|
|||
private readonly uint m_defaultHomeY;
|
||||
private IInventoryServices m_inventoryService;
|
||||
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
|
@ -82,7 +81,7 @@ namespace OpenSim.Region.Communications.Local
|
|||
|
||||
if (profile == null)
|
||||
{
|
||||
Console.WriteLine("Unknown Master User after creation attempt. No clue what to do here.");
|
||||
Console.WriteLine("[LOCAL USER SERVICES]: Unknown Master User after creation attempt. No clue what to do here.");
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -97,7 +96,7 @@ namespace OpenSim.Region.Communications.Local
|
|||
UserProfileData data = GetUserProfile(uuid);
|
||||
if (data == null)
|
||||
{
|
||||
throw new Exception("Unknown master user UUID. Possible reason: UserServer is not running.");
|
||||
throw new Exception("[LOCAL USER SERVICES]: Unknown master user UUID. Possible reason: UserServer is not running.");
|
||||
}
|
||||
return data;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue