diff options
author | MW | 2007-05-16 19:36:50 +0000 |
---|---|---|
committer | MW | 2007-05-16 19:36:50 +0000 |
commit | 939781e0101b951286fbf3d1cf1e46bdd37ab614 (patch) | |
tree | 61989293a79bf3ed245bac62cc4d413fad0dbf5b | |
parent | Moved the OpenSimMain class into the OpenSim.exe project (diff) | |
download | opensim-SC-939781e0101b951286fbf3d1cf1e46bdd37ab614.zip opensim-SC-939781e0101b951286fbf3d1cf1e46bdd37ab614.tar.gz opensim-SC-939781e0101b951286fbf3d1cf1e46bdd37ab614.tar.bz2 opensim-SC-939781e0101b951286fbf3d1cf1e46bdd37ab614.tar.xz |
Renamed OpenSimApplicationBase again this time to RegionServerBase
Diffstat (limited to '')
-rw-r--r-- | OpenSim.RegionServer/OpenSim.RegionServer.csproj | 2 | ||||
-rw-r--r-- | OpenSim.RegionServer/OpenSim.RegionServer.dll.build | 2 | ||||
-rw-r--r-- | OpenSim.RegionServer/RegionServerBase.cs (renamed from OpenSim.RegionServer/OpenSimApplicationBase.cs) | 28 | ||||
-rw-r--r-- | OpenSim/OpenSimMain.cs | 12 |
4 files changed, 33 insertions, 11 deletions
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj index aba06fe..38cc87b 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="OpenSimApplicationBase.cs" /> | 144 | <Compile Include="RegionServerBase.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 28bef04..5b61e1b 100644 --- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build +++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build | |||
@@ -16,12 +16,12 @@ | |||
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="OpenSimApplicationBase.cs" /> | ||
20 | <include name="OpenSimMain.cs" /> | 19 | <include name="OpenSimMain.cs" /> |
21 | <include name="OpenSimNetworkHandler.cs" /> | 20 | <include name="OpenSimNetworkHandler.cs" /> |
22 | <include name="PacketServer.cs" /> | 21 | <include name="PacketServer.cs" /> |
23 | <include name="RegionInfo.cs" /> | 22 | <include name="RegionInfo.cs" /> |
24 | <include name="RegionInfoBase.cs" /> | 23 | <include name="RegionInfoBase.cs" /> |
24 | <include name="RegionServerBase.cs" /> | ||
25 | <include name="SimClient.cs" /> | 25 | <include name="SimClient.cs" /> |
26 | <include name="SimClient.Grid.cs" /> | 26 | <include name="SimClient.Grid.cs" /> |
27 | <include name="SimClient.PacketHandlers.cs" /> | 27 | <include name="SimClient.PacketHandlers.cs" /> |
diff --git a/OpenSim.RegionServer/OpenSimApplicationBase.cs b/OpenSim.RegionServer/RegionServerBase.cs index 0c5a5cf..69a8748 100644 --- a/OpenSim.RegionServer/OpenSimApplicationBase.cs +++ b/OpenSim.RegionServer/RegionServerBase.cs | |||
@@ -25,7 +25,7 @@ using OpenSim.GenericConfig; | |||
25 | 25 | ||
26 | namespace OpenSim | 26 | namespace OpenSim |
27 | { | 27 | { |
28 | public class OpenSimApplicationBase | 28 | public class RegionServerBase |
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 OpenSimApplicationBase() | 54 | public RegionServerBase() |
55 | { | 55 | { |
56 | 56 | ||
57 | } | 57 | } |
58 | 58 | ||
59 | public OpenSimApplicationBase(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile) | 59 | public RegionServerBase(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; |
@@ -77,5 +77,27 @@ namespace OpenSim | |||
77 | public virtual void StartUp() | 77 | public virtual void StartUp() |
78 | { | 78 | { |
79 | } | 79 | } |
80 | |||
81 | protected virtual void SetupLocalGridServers() | ||
82 | { | ||
83 | } | ||
84 | |||
85 | protected virtual void SetupRemoteGridServers() | ||
86 | { | ||
87 | |||
88 | } | ||
89 | |||
90 | protected virtual void SetupLocalWorld() | ||
91 | { | ||
92 | } | ||
93 | |||
94 | protected virtual void SetupHttpListener() | ||
95 | { | ||
96 | } | ||
97 | |||
98 | protected virtual void ConnectToRemoteGridServer() | ||
99 | { | ||
100 | |||
101 | } | ||
80 | } | 102 | } |
81 | } | 103 | } |
diff --git a/OpenSim/OpenSimMain.cs b/OpenSim/OpenSimMain.cs index b7c8bef..8da76ca 100644 --- a/OpenSim/OpenSimMain.cs +++ b/OpenSim/OpenSimMain.cs | |||
@@ -54,7 +54,7 @@ using OpenSim.GenericConfig; | |||
54 | namespace OpenSim | 54 | namespace OpenSim |
55 | { | 55 | { |
56 | 56 | ||
57 | public class OpenSimMain : OpenSimApplicationBase, conscmd_callback | 57 | public class OpenSimMain : RegionServerBase, conscmd_callback |
58 | { | 58 | { |
59 | 59 | ||
60 | public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile) | 60 | public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile) |
@@ -184,7 +184,7 @@ namespace OpenSim | |||
184 | } | 184 | } |
185 | 185 | ||
186 | # region Setup methods | 186 | # region Setup methods |
187 | protected virtual void SetupLocalGridServers() | 187 | protected override void SetupLocalGridServers() |
188 | { | 188 | { |
189 | GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll"; | 189 | GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll"; |
190 | GridServers.GridDll = "OpenSim.GridInterfaces.Local.dll"; | 190 | GridServers.GridDll = "OpenSim.GridInterfaces.Local.dll"; |
@@ -202,7 +202,7 @@ namespace OpenSim | |||
202 | } | 202 | } |
203 | } | 203 | } |
204 | 204 | ||
205 | protected virtual void SetupRemoteGridServers() | 205 | protected override void SetupRemoteGridServers() |
206 | { | 206 | { |
207 | if (this.gridLocalAsset) | 207 | if (this.gridLocalAsset) |
208 | { | 208 | { |
@@ -227,7 +227,7 @@ namespace OpenSim | |||
227 | } | 227 | } |
228 | } | 228 | } |
229 | 229 | ||
230 | protected virtual void SetupLocalWorld() | 230 | protected override void SetupLocalWorld() |
231 | { | 231 | { |
232 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "Main.cs:Startup() - We are " + regionData.RegionName + " at " + regionData.RegionLocX.ToString() + "," + regionData.RegionLocY.ToString()); | 232 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "Main.cs:Startup() - We are " + regionData.RegionName + " at " + regionData.RegionLocX.ToString() + "," + regionData.RegionLocY.ToString()); |
233 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Initialising world"); | 233 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Initialising world"); |
@@ -254,7 +254,7 @@ namespace OpenSim | |||
254 | LocalWorld.LoadPrimsFromStorage(); | 254 | LocalWorld.LoadPrimsFromStorage(); |
255 | } | 255 | } |
256 | 256 | ||
257 | protected virtual void SetupHttpListener() | 257 | protected override void SetupHttpListener() |
258 | { | 258 | { |
259 | httpServer = new BaseHttpServer(regionData.IPListenPort); | 259 | httpServer = new BaseHttpServer(regionData.IPListenPort); |
260 | 260 | ||
@@ -292,7 +292,7 @@ namespace OpenSim | |||
292 | } | 292 | } |
293 | } | 293 | } |
294 | 294 | ||
295 | protected virtual void ConnectToRemoteGridServer() | 295 | protected override void ConnectToRemoteGridServer() |
296 | { | 296 | { |
297 | if (GridServers.GridServer.RequestConnection(regionData.SimUUID, regionData.IPListenAddr, (uint)regionData.IPListenPort)) | 297 | if (GridServers.GridServer.RequestConnection(regionData.SimUUID, regionData.IPListenAddr, (uint)regionData.IPListenPort)) |
298 | { | 298 | { |