OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Renamed OpenSimApplicationBase again this time to RegionServerBase

zircon^2
MW 2007-05-16 19:36:50 +00:00
parent 2a6d69b2b8
commit 939781e010
4 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim.RegionServer/OpenSim.RegionServer.csproj
View File

@ -141,7 +141,7 @@
<Compile Include="Grid.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="OpenSimApplicationBase.cs" />
<Compile Include="RegionServerBase.cs" />
<Compile Include="OpenSimMain.cs">
<SubType>Code</SubType>
</Compile>

2
OpenSim.RegionServer/OpenSim.RegionServer.dll.build
View File

@ -16,12 +16,12 @@
<include name="AuthenticateSessionsLocal.cs" />
<include name="AuthenticateSessionsRemote.cs" />
<include name="Grid.cs" />
<include name="OpenSimApplicationBase.cs" />
<include name="OpenSimMain.cs" />
<include name="OpenSimNetworkHandler.cs" />
<include name="PacketServer.cs" />
<include name="RegionInfo.cs" />
<include name="RegionInfoBase.cs" />
<include name="RegionServerBase.cs" />
<include name="SimClient.cs" />
<include name="SimClient.Grid.cs" />
<include name="SimClient.PacketHandlers.cs" />

28
OpenSim.RegionServer/OpenSimApplicationBase.cs → OpenSim.RegionServer/RegionServerBase.cs
View File

@ -25,7 +25,7 @@ using OpenSim.GenericConfig;
namespace OpenSim
{
public class OpenSimApplicationBase
public class RegionServerBase
{
protected IGenericConfig localConfig;
protected PhysicsManager physManager;
@ -51,12 +51,12 @@ namespace OpenSim
protected ConsoleBase m_console;
public OpenSimApplicationBase()
public RegionServerBase()
{
}
public OpenSimApplicationBase(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile)
public RegionServerBase(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile)
{
this.configFileSetup = useConfigFile;
m_sandbox = sandBoxMode;
@ -77,5 +77,27 @@ namespace OpenSim
public virtual void StartUp()
{
}
protected virtual void SetupLocalGridServers()
{
}
protected virtual void SetupRemoteGridServers()
{
}
protected virtual void SetupLocalWorld()
{
}
protected virtual void SetupHttpListener()
{
}
protected virtual void ConnectToRemoteGridServer()
{
}
}
}

12
OpenSim/OpenSimMain.cs
View File

@ -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))
{