aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim.RegionServer/OpenSim.RegionServer.csproj2
-rw-r--r--OpenSim.RegionServer/OpenSim.RegionServer.dll.build2
-rw-r--r--OpenSim.RegionServer/OpenSimApplicationBase.cs (renamed from OpenSim.RegionServer/OpenSimApplication.cs)6
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs7
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 @@
141 <Compile Include="Grid.cs"> 141 <Compile Include="Grid.cs">
142 <SubType>Code</SubType> 142 <SubType>Code</SubType>
143 </Compile> 143 </Compile>
144 <Compile Include="OpenSimApplication.cs" /> 144 <Compile Include="OpenSimApplicationBase.cs" />
145 <Compile Include="OpenSimMain.cs"> 145 <Compile Include="OpenSimMain.cs">
146 <SubType>Code</SubType> 146 <SubType>Code</SubType>
147 </Compile> 147 </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 @@
16 <include name="AuthenticateSessionsLocal.cs" /> 16 <include name="AuthenticateSessionsLocal.cs" />
17 <include name="AuthenticateSessionsRemote.cs" /> 17 <include name="AuthenticateSessionsRemote.cs" />
18 <include name="Grid.cs" /> 18 <include name="Grid.cs" />
19 <include name="OpenSimApplication.cs" /> 19 <include name="OpenSimApplicationBase.cs" />
20 <include name="OpenSimMain.cs" /> 20 <include name="OpenSimMain.cs" />
21 <include name="OpenSimNetworkHandler.cs" /> 21 <include name="OpenSimNetworkHandler.cs" />
22 <include name="PacketServer.cs" /> 22 <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;
25 25
26namespace OpenSim 26namespace OpenSim
27{ 27{
28 public class OpenSimApplication 28 public class OpenSimApplicationBase
29 { 29 {
30 protected IGenericConfig localConfig; 30 protected IGenericConfig localConfig;
31 protected PhysicsManager physManager; 31 protected PhysicsManager physManager;
@@ -51,12 +51,12 @@ namespace OpenSim
51 51
52 protected ConsoleBase m_console; 52 protected ConsoleBase m_console;
53 53
54 public OpenSimApplication() 54 public OpenSimApplicationBase()
55 { 55 {
56 56
57 } 57 }
58 58
59 public OpenSimApplication(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile) 59 public OpenSimApplicationBase(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile)
60 { 60 {
61 this.configFileSetup = useConfigFile; 61 this.configFileSetup = useConfigFile;
62 m_sandbox = sandBoxMode; 62 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;
53 53
54namespace OpenSim 54namespace OpenSim
55{ 55{
56 56 //moved to the opensim main application project (do we want it there or here?)
57 public class OpenSimMain : OpenSimApplication , conscmd_callback 57/*
58 public class OpenSimMain : OpenSimApplicationBase , conscmd_callback
58 { 59 {
59 60
60 public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile) 61 public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile)
@@ -526,5 +527,5 @@ namespace OpenSim
526 #endregion 527 #endregion
527 } 528 }
528 529
529 530 */
530} 531}