Moved the OpenSimMain class into the OpenSim.exe project

This commit is contained in:
MW
2007-05-16 18:59:51 +00:00
parent 7cc41b9e38
commit 2a6d69b2b8
9 changed files with 588 additions and 28 deletions

View File

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

View File

@@ -16,7 +16,7 @@
<include name="AuthenticateSessionsLocal.cs" />
<include name="AuthenticateSessionsRemote.cs" />
<include name="Grid.cs" />
<include name="OpenSimApplication.cs" />
<include name="OpenSimApplicationBase.cs" />
<include name="OpenSimMain.cs" />
<include name="OpenSimNetworkHandler.cs" />
<include name="PacketServer.cs" />

View File

@@ -25,7 +25,7 @@ using OpenSim.GenericConfig;
namespace OpenSim
{
public class OpenSimApplication
public class OpenSimApplicationBase
{
protected IGenericConfig localConfig;
protected PhysicsManager physManager;
@@ -51,12 +51,12 @@ namespace OpenSim
protected ConsoleBase m_console;
public OpenSimApplication()
public OpenSimApplicationBase()
{
}
public OpenSimApplication(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile)
public OpenSimApplicationBase(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile)
{
this.configFileSetup = useConfigFile;
m_sandbox = sandBoxMode;

View File

@@ -53,8 +53,9 @@ using OpenSim.GenericConfig;
namespace OpenSim
{
public class OpenSimMain : OpenSimApplication , conscmd_callback
//moved to the opensim main application project (do we want it there or here?)
/*
public class OpenSimMain : OpenSimApplicationBase , conscmd_callback
{
public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile)
@@ -526,5 +527,5 @@ namespace OpenSim
#endregion
}
*/
}