Moved the OpenSimMain class into the OpenSim.exe project

4 files changed, 9 insertions, 8 deletions

diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 6457b9e..aba06fe 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -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>

diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 580772d..28bef04 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -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" />

diff --git a/OpenSim.RegionServer/OpenSimApplication.cs b/OpenSim.RegionServer/OpenSimApplicationBase.cs
index f7bcd21..0c5a5cf 100644
--- a/OpenSim.RegionServer/OpenSimApplication.cs
+++ b/OpenSim.RegionServer/OpenSimApplicationBase.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;

diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index a333074..003412d 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -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

     }

 

-

+    */

 }