mirror of
https://github.com/opensim/opensim.git
synced 2026-08-04 16:22:50 +08:00
Moved the OpenSimMain class into the OpenSim.exe project
This commit is contained in:
@@ -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>
|
||||
|
||||
@@ -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" />
|
||||
|
||||
@@ -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;
|
||||
@@ -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
|
||||
}
|
||||
|
||||
|
||||
*/
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user