ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 11:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added OpenSimApplication as a base class to OpenSimMain

Browse Source
This commit is contained in:
MW
2007-05-16 18:26:30 +00:00
parent 5f9b7321bc
commit 7cc41b9e38
36 changed files with 1854 additions and 1801 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
OpenSim.RegionServer/OpenSimMain.cs
View File

@@ -54,32 +54,8 @@ using OpenSim.GenericConfig;
namespace OpenSim
{
public class OpenSimMain : conscmd_callback
public class OpenSimMain : OpenSimApplication , conscmd_callback
{
private IGenericConfig localConfig;
//private IGenericConfig remoteConfig;
private PhysicsManager physManager;
private Grid GridServers;
private AssetCache AssetCache;
private InventoryCache InventoryCache;
private Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();
private DateTime startuptime;
private RegionInfo regionData;
private System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer();
public string m_physicsEngine;
public bool m_sandbox = false;
public bool m_loginserver;
public bool user_accounts = false;
public bool gridLocalAsset = false;
private bool configFileSetup = false;
public string m_config;
private UDPServer m_udpServer;
protected BaseHttpServer httpServer;
private AuthenticateSessionsBase AuthenticateSessionsHandler;
protected ConsoleBase m_console;
public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile)
{
@@ -93,16 +69,10 @@ namespace OpenSim
OpenSim.Framework.Console.MainConsole.Instance = m_console;
}
private World m_localWorld;
public World LocalWorld
{
get { return m_localWorld; }
}
/// <summary>
/// Performs initialisation of the world, such as loading configuration from disk.
/// </summary>
public virtual void StartUp()
public override void StartUp()
{
this.regionData = new RegionInfo();
try