From 939781e0101b951286fbf3d1cf1e46bdd37ab614 Mon Sep 17 00:00:00 2001
From: MW
Date: Wed, 16 May 2007 19:36:50 +0000
Subject: Renamed OpenSimApplicationBase again this time to RegionServerBase
---
OpenSim.RegionServer/OpenSim.RegionServer.csproj | 2 +-
.../OpenSim.RegionServer.dll.build | 2 +-
OpenSim.RegionServer/OpenSimApplicationBase.cs | 81 ----------------
OpenSim.RegionServer/RegionServerBase.cs | 103 +++++++++++++++++++++
OpenSim/OpenSimMain.cs | 12 +--
5 files changed, 111 insertions(+), 89 deletions(-)
delete mode 100644 OpenSim.RegionServer/OpenSimApplicationBase.cs
create mode 100644 OpenSim.RegionServer/RegionServerBase.cs
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index aba06fe..38cc87b 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -141,7 +141,7 @@
Code
-
+
Code
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 28bef04..5b61e1b 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -16,12 +16,12 @@
-
+
diff --git a/OpenSim.RegionServer/OpenSimApplicationBase.cs b/OpenSim.RegionServer/OpenSimApplicationBase.cs
deleted file mode 100644
index 0c5a5cf..0000000
--- a/OpenSim.RegionServer/OpenSimApplicationBase.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System;
-using System.Text;
-using System.IO;
-using System.Threading;
-using System.Net;
-using System.Net.Sockets;
-using System.Timers;
-using System.Reflection;
-using System.Collections;
-using System.Collections.Generic;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.world;
-using OpenSim.Terrain;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.UserServer;
-using OpenSim.Assets;
-using OpenSim.CAPS;
-using OpenSim.Framework.Console;
-using OpenSim.Physics.Manager;
-using Nwc.XmlRpc;
-using OpenSim.Servers;
-using OpenSim.GenericConfig;
-
-namespace OpenSim
-{
- public class OpenSimApplicationBase
- {
- protected IGenericConfig localConfig;
- protected PhysicsManager physManager;
- protected Grid GridServers;
- protected AssetCache AssetCache;
- protected InventoryCache InventoryCache;
- protected Dictionary clientCircuits = new Dictionary();
- protected DateTime startuptime;
- protected RegionInfo regionData;
-
- protected 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;
- protected bool configFileSetup = false;
- public string m_config;
-
- protected UDPServer m_udpServer;
- protected BaseHttpServer httpServer;
- protected AuthenticateSessionsBase AuthenticateSessionsHandler;
-
- protected ConsoleBase m_console;
-
- public OpenSimApplicationBase()
- {
-
- }
-
- public OpenSimApplicationBase(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile)
- {
- this.configFileSetup = useConfigFile;
- m_sandbox = sandBoxMode;
- m_loginserver = startLoginServer;
- m_physicsEngine = physicsEngine;
- m_config = configFile;
- }
-
- protected World m_localWorld;
- public World LocalWorld
- {
- get { return m_localWorld; }
- }
-
- ///
- /// Performs initialisation of the world, such as loading configuration from disk.
- ///
- public virtual void StartUp()
- {
- }
- }
-}
diff --git a/OpenSim.RegionServer/RegionServerBase.cs b/OpenSim.RegionServer/RegionServerBase.cs
new file mode 100644
index 0000000..69a8748
--- /dev/null
+++ b/OpenSim.RegionServer/RegionServerBase.cs
@@ -0,0 +1,103 @@
+using System;
+using System.Text;
+using System.IO;
+using System.Threading;
+using System.Net;
+using System.Net.Sockets;
+using System.Timers;
+using System.Reflection;
+using System.Collections;
+using System.Collections.Generic;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.world;
+using OpenSim.Terrain;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.UserServer;
+using OpenSim.Assets;
+using OpenSim.CAPS;
+using OpenSim.Framework.Console;
+using OpenSim.Physics.Manager;
+using Nwc.XmlRpc;
+using OpenSim.Servers;
+using OpenSim.GenericConfig;
+
+namespace OpenSim
+{
+ public class RegionServerBase
+ {
+ protected IGenericConfig localConfig;
+ protected PhysicsManager physManager;
+ protected Grid GridServers;
+ protected AssetCache AssetCache;
+ protected InventoryCache InventoryCache;
+ protected Dictionary clientCircuits = new Dictionary();
+ protected DateTime startuptime;
+ protected RegionInfo regionData;
+
+ protected 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;
+ protected bool configFileSetup = false;
+ public string m_config;
+
+ protected UDPServer m_udpServer;
+ protected BaseHttpServer httpServer;
+ protected AuthenticateSessionsBase AuthenticateSessionsHandler;
+
+ protected ConsoleBase m_console;
+
+ public RegionServerBase()
+ {
+
+ }
+
+ public RegionServerBase(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile)
+ {
+ this.configFileSetup = useConfigFile;
+ m_sandbox = sandBoxMode;
+ m_loginserver = startLoginServer;
+ m_physicsEngine = physicsEngine;
+ m_config = configFile;
+ }
+
+ protected World m_localWorld;
+ public World LocalWorld
+ {
+ get { return m_localWorld; }
+ }
+
+ ///
+ /// Performs initialisation of the world, such as loading configuration from disk.
+ ///
+ public virtual void StartUp()
+ {
+ }
+
+ protected virtual void SetupLocalGridServers()
+ {
+ }
+
+ protected virtual void SetupRemoteGridServers()
+ {
+
+ }
+
+ protected virtual void SetupLocalWorld()
+ {
+ }
+
+ protected virtual void SetupHttpListener()
+ {
+ }
+
+ protected virtual void ConnectToRemoteGridServer()
+ {
+
+ }
+ }
+}
diff --git a/OpenSim/OpenSimMain.cs b/OpenSim/OpenSimMain.cs
index b7c8bef..8da76ca 100644
--- a/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSimMain.cs
@@ -54,7 +54,7 @@ using OpenSim.GenericConfig;
namespace OpenSim
{
- public class OpenSimMain : OpenSimApplicationBase, conscmd_callback
+ public class OpenSimMain : RegionServerBase, conscmd_callback
{
public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile)
@@ -184,7 +184,7 @@ namespace OpenSim
}
# region Setup methods
- protected virtual void SetupLocalGridServers()
+ protected override void SetupLocalGridServers()
{
GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll";
GridServers.GridDll = "OpenSim.GridInterfaces.Local.dll";
@@ -202,7 +202,7 @@ namespace OpenSim
}
}
- protected virtual void SetupRemoteGridServers()
+ protected override void SetupRemoteGridServers()
{
if (this.gridLocalAsset)
{
@@ -227,7 +227,7 @@ namespace OpenSim
}
}
- protected virtual void SetupLocalWorld()
+ protected override void SetupLocalWorld()
{
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "Main.cs:Startup() - We are " + regionData.RegionName + " at " + regionData.RegionLocX.ToString() + "," + regionData.RegionLocY.ToString());
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Initialising world");
@@ -254,7 +254,7 @@ namespace OpenSim
LocalWorld.LoadPrimsFromStorage();
}
- protected virtual void SetupHttpListener()
+ protected override void SetupHttpListener()
{
httpServer = new BaseHttpServer(regionData.IPListenPort);
@@ -292,7 +292,7 @@ namespace OpenSim
}
}
- protected virtual void ConnectToRemoteGridServer()
+ protected override void ConnectToRemoteGridServer()
{
if (GridServers.GridServer.RequestConnection(regionData.SimUUID, regionData.IPListenAddr, (uint)regionData.IPListenPort))
{
--
cgit v1.1