aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-02-04 18:52:24 +0000
committerJustin Clarke Casey2008-02-04 18:52:24 +0000
commitbaefa05b575b28e1ed08670e9c937ca307f09269 (patch)
tree8f9703391fe86df4ecc1008a140e1ea760c1ae1b /OpenSim/Region/ClientStack
parentChange sim command from "stats" to "show stats" for consistency (diff)
downloadopensim-SC_OLD-baefa05b575b28e1ed08670e9c937ca307f09269.zip
opensim-SC_OLD-baefa05b575b28e1ed08670e9c937ca307f09269.tar.gz
opensim-SC_OLD-baefa05b575b28e1ed08670e9c937ca307f09269.tar.bz2
opensim-SC_OLD-baefa05b575b28e1ed08670e9c937ca307f09269.tar.xz
* Rebase all current servers on common abstract BaseOpenSimServer class
* The immediate upshot is that "show uptime" from the console will now show uptime on all server types (user, asset, grid, etc) * DEV: This refactoring is far from complete - only just enough to makes the "show uptime" command common accross the servers. More is needed, but in this case it's somewhat like eating cabbage, which I prefer not to do all at once
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs9
1 files changed, 1 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index d6cf7c3..72917d1 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -40,17 +40,15 @@ using OpenSim.Region.Physics.Manager;
40 40
41namespace OpenSim.Region.ClientStack 41namespace OpenSim.Region.ClientStack
42{ 42{
43 public abstract class RegionApplicationBase 43 public abstract class RegionApplicationBase : BaseOpenSimServer
44 { 44 {
45 protected AssetCache m_assetCache; 45 protected AssetCache m_assetCache;
46 protected Dictionary<EndPoint, uint> m_clientCircuits = new Dictionary<EndPoint, uint>(); 46 protected Dictionary<EndPoint, uint> m_clientCircuits = new Dictionary<EndPoint, uint>();
47 protected DateTime m_startuptime;
48 protected NetworkServersInfo m_networkServersInfo; 47 protected NetworkServersInfo m_networkServersInfo;
49 48
50 protected BaseHttpServer m_httpServer; 49 protected BaseHttpServer m_httpServer;
51 protected uint m_httpServerPort; 50 protected uint m_httpServerPort;
52 51
53 protected LogBase m_log;
54 protected CommunicationsManager m_commsManager; 52 protected CommunicationsManager m_commsManager;
55 53
56 protected SceneManager m_sceneManager = new SceneManager(); 54 protected SceneManager m_sceneManager = new SceneManager();
@@ -67,11 +65,6 @@ namespace OpenSim.Region.ClientStack
67 get { return m_sceneManager; } 65 get { return m_sceneManager; }
68 } 66 }
69 67
70 public RegionApplicationBase()
71 {
72 m_startuptime = DateTime.Now;
73 }
74
75 public virtual void StartUp() 68 public virtual void StartUp()
76 { 69 {
77 ClientView.TerrainManager = new TerrainManager(new SecondLife()); 70 ClientView.TerrainManager = new TerrainManager(new SecondLife());