aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.RegionServer/RegionServerBase.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/OpenSim.RegionServer/RegionServerBase.cs')
-rw-r--r--OpenSim/OpenSim.RegionServer/RegionServerBase.cs13
1 files changed, 6 insertions, 7 deletions
diff --git a/OpenSim/OpenSim.RegionServer/RegionServerBase.cs b/OpenSim/OpenSim.RegionServer/RegionServerBase.cs
index 69a8748..7f18d34 100644
--- a/OpenSim/OpenSim.RegionServer/RegionServerBase.cs
+++ b/OpenSim/OpenSim.RegionServer/RegionServerBase.cs
@@ -10,7 +10,6 @@ using System.Collections;
10using System.Collections.Generic; 10using System.Collections.Generic;
11using libsecondlife; 11using libsecondlife;
12using libsecondlife.Packets; 12using libsecondlife.Packets;
13using OpenSim.world;
14using OpenSim.Terrain; 13using OpenSim.Terrain;
15using OpenSim.Framework.Interfaces; 14using OpenSim.Framework.Interfaces;
16using OpenSim.Framework.Types; 15using OpenSim.Framework.Types;
@@ -29,14 +28,12 @@ namespace OpenSim
29 { 28 {
30 protected IGenericConfig localConfig; 29 protected IGenericConfig localConfig;
31 protected PhysicsManager physManager; 30 protected PhysicsManager physManager;
32 protected Grid GridServers;
33 protected AssetCache AssetCache; 31 protected AssetCache AssetCache;
34 protected InventoryCache InventoryCache; 32 protected InventoryCache InventoryCache;
35 protected Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>(); 33 protected Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();
36 protected DateTime startuptime; 34 protected DateTime startuptime;
37 protected RegionInfo regionData; 35 protected NetworkServersInfo serversData;
38 36
39 protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer();
40 public string m_physicsEngine; 37 public string m_physicsEngine;
41 public bool m_sandbox = false; 38 public bool m_sandbox = false;
42 public bool m_loginserver; 39 public bool m_loginserver;
@@ -45,7 +42,9 @@ namespace OpenSim
45 protected bool configFileSetup = false; 42 protected bool configFileSetup = false;
46 public string m_config; 43 public string m_config;
47 44
48 protected UDPServer m_udpServer; 45 protected List<UDPServer> m_udpServer = new List<UDPServer>();
46 protected List<RegionInfo> regionData = new List<RegionInfo>();
47 protected List<IWorld> m_localWorld = new List<IWorld>();
49 protected BaseHttpServer httpServer; 48 protected BaseHttpServer httpServer;
50 protected AuthenticateSessionsBase AuthenticateSessionsHandler; 49 protected AuthenticateSessionsBase AuthenticateSessionsHandler;
51 50
@@ -65,11 +64,11 @@ namespace OpenSim
65 m_config = configFile; 64 m_config = configFile;
66 } 65 }
67 66
68 protected World m_localWorld; 67 /*protected World m_localWorld;
69 public World LocalWorld 68 public World LocalWorld
70 { 69 {
71 get { return m_localWorld; } 70 get { return m_localWorld; }
72 } 71 }*/
73 72
74 /// <summary> 73 /// <summary>
75 /// Performs initialisation of the world, such as loading configuration from disk. 74 /// Performs initialisation of the world, such as loading configuration from disk.