diff options
author | lbsa71 | 2007-03-27 19:12:55 +0000 |
---|---|---|
committer | lbsa71 | 2007-03-27 19:12:55 +0000 |
commit | ccfddd1775fe2786ad54b7bbfe528e7eb65170b1 (patch) | |
tree | e9f60b7bdb0b84917ed060159814357ea80321c4 /OpenSim.RegionServer/OpenSimMain.cs | |
parent | * Introduced BaseHttpServer (doing nothing at the moment) (diff) | |
download | opensim-SC-ccfddd1775fe2786ad54b7bbfe528e7eb65170b1.zip opensim-SC-ccfddd1775fe2786ad54b7bbfe528e7eb65170b1.tar.gz opensim-SC-ccfddd1775fe2786ad54b7bbfe528e7eb65170b1.tar.bz2 opensim-SC-ccfddd1775fe2786ad54b7bbfe528e7eb65170b1.tar.xz |
* Continued refactoring away OpenSimRoot - now it's down to the final 2.
Diffstat (limited to '')
-rw-r--r-- | OpenSim.RegionServer/OpenSimMain.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs index a24d1fb..91f8008 100644 --- a/OpenSim.RegionServer/OpenSimMain.cs +++ b/OpenSim.RegionServer/OpenSimMain.cs | |||
@@ -91,7 +91,7 @@ namespace OpenSim | |||
91 | 91 | ||
92 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Main.cs:Startup() - We are " + OpenSimRoot.Instance.Cfg.RegionName + " at " + OpenSimRoot.Instance.Cfg.RegionLocX.ToString() + "," + OpenSimRoot.Instance.Cfg.RegionLocY.ToString()); | 92 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Main.cs:Startup() - We are " + OpenSimRoot.Instance.Cfg.RegionName + " at " + OpenSimRoot.Instance.Cfg.RegionLocX.ToString() + "," + OpenSimRoot.Instance.Cfg.RegionLocY.ToString()); |
93 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Initialising world"); | 93 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Initialising world"); |
94 | OpenSimRoot.Instance.LocalWorld = new World(); | 94 | OpenSimRoot.Instance.LocalWorld = new World(OpenSimRoot.Instance.ClientThreads, OpenSimRoot.Instance.Cfg.RegionHandle, OpenSimRoot.Instance.LocalWorld, OpenSimRoot.Instance.Cfg.RegionName, OpenSimRoot.Instance.Cfg); |
95 | OpenSimRoot.Instance.LocalWorld.LandMap = OpenSimRoot.Instance.Cfg.LoadWorld(); | 95 | OpenSimRoot.Instance.LocalWorld.LandMap = OpenSimRoot.Instance.Cfg.LoadWorld(); |
96 | 96 | ||
97 | this.physManager = new OpenSim.Physics.Manager.PhysicsManager(); | 97 | this.physManager = new OpenSim.Physics.Manager.PhysicsManager(); |
@@ -114,7 +114,7 @@ namespace OpenSim | |||
114 | 114 | ||
115 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting CAPS HTTP server"); | 115 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting CAPS HTTP server"); |
116 | OpenSimRoot.Instance.HttpServer = new SimCAPSHTTPServer(OpenSimRoot.Instance.GridServers.GridServer, OpenSimRoot.Instance.Cfg.IPListenPort); | 116 | OpenSimRoot.Instance.HttpServer = new SimCAPSHTTPServer(OpenSimRoot.Instance.GridServers.GridServer, OpenSimRoot.Instance.Cfg.IPListenPort); |
117 | OpenSimRoot.Instance.HttpServer.AddRestHandler("Admin", new AdminWebFront("Admin")); | 117 | OpenSimRoot.Instance.HttpServer.AddRestHandler("Admin", new AdminWebFront("Admin", OpenSimRoot.Instance.LocalWorld)); |
118 | 118 | ||
119 | timer1.Enabled = true; | 119 | timer1.Enabled = true; |
120 | timer1.Interval = 100; | 120 | timer1.Interval = 100; |