aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSimMain.cs
diff options
context:
space:
mode:
authorMW2007-05-16 19:36:50 +0000
committerMW2007-05-16 19:36:50 +0000
commit939781e0101b951286fbf3d1cf1e46bdd37ab614 (patch)
tree61989293a79bf3ed245bac62cc4d413fad0dbf5b /OpenSim/OpenSimMain.cs
parentMoved the OpenSimMain class into the OpenSim.exe project (diff)
downloadopensim-SC_OLD-939781e0101b951286fbf3d1cf1e46bdd37ab614.zip
opensim-SC_OLD-939781e0101b951286fbf3d1cf1e46bdd37ab614.tar.gz
opensim-SC_OLD-939781e0101b951286fbf3d1cf1e46bdd37ab614.tar.bz2
opensim-SC_OLD-939781e0101b951286fbf3d1cf1e46bdd37ab614.tar.xz
Renamed OpenSimApplicationBase again this time to RegionServerBase
Diffstat (limited to 'OpenSim/OpenSimMain.cs')
-rw-r--r--OpenSim/OpenSimMain.cs12
1 files changed, 6 insertions, 6 deletions
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;
54namespace OpenSim 54namespace 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 {