- turn private m_gui into protected m_gui to allow manipulation in
derived classes - make OpenSimBackground inherit from OpenSim instead of OpenSimBase so that it will have a MainConsole instance and we can use console commands, setting m_gui to false0.6.5-rc1
parent
96259e82f6
commit
bd2ca2d9c1
|
@ -51,10 +51,10 @@ namespace OpenSim
|
||||||
|
|
||||||
protected string m_startupCommandsFile;
|
protected string m_startupCommandsFile;
|
||||||
protected string m_shutdownCommandsFile;
|
protected string m_shutdownCommandsFile;
|
||||||
|
protected bool m_gui = false;
|
||||||
|
|
||||||
private string m_timedScript = "disabled";
|
private string m_timedScript = "disabled";
|
||||||
private Timer m_scriptTimer;
|
private Timer m_scriptTimer;
|
||||||
private bool m_gui = false;
|
|
||||||
|
|
||||||
public OpenSim(IConfigSource configSource) : base(configSource)
|
public OpenSim(IConfigSource configSource) : base(configSource)
|
||||||
{
|
{
|
||||||
|
|
|
@ -35,7 +35,7 @@ namespace OpenSim
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Consoleless OpenSim region server
|
/// Consoleless OpenSim region server
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class OpenSimBackground : OpenSimBase
|
public class OpenSimBackground : OpenSim
|
||||||
{
|
{
|
||||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
|
|
||||||
|
@ -50,18 +50,10 @@ namespace OpenSim
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public override void Startup()
|
public override void Startup()
|
||||||
{
|
{
|
||||||
//
|
m_gui = false;
|
||||||
// Called from app startup (OpenSim.Application)
|
|
||||||
//
|
|
||||||
m_log.Info("====================================================================");
|
|
||||||
m_log.Info("========================= STARTING OPENSIM =========================");
|
|
||||||
m_log.Info("====================================================================");
|
|
||||||
m_log.InfoFormat("[OPENSIM MAIN]: Running in background {0} mode",
|
|
||||||
ConfigurationSettings.Standalone ? "sandbox" : "grid");
|
|
||||||
|
|
||||||
base.Startup();
|
base.Startup();
|
||||||
|
|
||||||
// We are done with startup
|
|
||||||
m_log.InfoFormat("[OPENSIM MAIN]: Startup complete, serving {0} region{1}",
|
m_log.InfoFormat("[OPENSIM MAIN]: Startup complete, serving {0} region{1}",
|
||||||
m_clientServers.Count.ToString(), m_clientServers.Count > 1 ? "s" : "");
|
m_clientServers.Count.ToString(), m_clientServers.Count > 1 ? "s" : "");
|
||||||
|
|
||||||
|
@ -74,7 +66,6 @@ namespace OpenSim
|
||||||
public override void Shutdown()
|
public override void Shutdown()
|
||||||
{
|
{
|
||||||
WorldHasComeToAnEnd.Set();
|
WorldHasComeToAnEnd.Set();
|
||||||
|
|
||||||
base.Shutdown();
|
base.Shutdown();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue