diff options
author | lbsa71 | 2007-03-27 20:45:04 +0000 |
---|---|---|
committer | lbsa71 | 2007-03-27 20:45:04 +0000 |
commit | 7adbe756fbb1d1c4cd71df90bd12d7e3da60bdf8 (patch) | |
tree | d8dc563b7fef4ce9dcc34fbcc31c3fcc7d99d49f /OpenSim/RegionServer.cs | |
parent | * Config should be loaded before login server startup... (diff) | |
download | opensim-SC-7adbe756fbb1d1c4cd71df90bd12d7e3da60bdf8.zip opensim-SC-7adbe756fbb1d1c4cd71df90bd12d7e3da60bdf8.tar.gz opensim-SC-7adbe756fbb1d1c4cd71df90bd12d7e3da60bdf8.tar.bz2 opensim-SC-7adbe756fbb1d1c4cd71df90bd12d7e3da60bdf8.tar.xz |
* Reverting todays work. It was worth a try.
Diffstat (limited to 'OpenSim/RegionServer.cs')
-rw-r--r-- | OpenSim/RegionServer.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/RegionServer.cs b/OpenSim/RegionServer.cs index a0037b1..3612d49 100644 --- a/OpenSim/RegionServer.cs +++ b/OpenSim/RegionServer.cs | |||
@@ -7,7 +7,7 @@ using OpenSim.Framework.Console; | |||
7 | namespace OpenSim | 7 | namespace OpenSim |
8 | { | 8 | { |
9 | public class RegionServer : OpenSimMain | 9 | public class RegionServer : OpenSimMain |
10 | { | 10 | { |
11 | [STAThread] | 11 | [STAThread] |
12 | public static void Main(string[] args) | 12 | public static void Main(string[] args) |
13 | { | 13 | { |
@@ -63,14 +63,14 @@ namespace OpenSim | |||
63 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting in Grid mode"); | 63 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting in Grid mode"); |
64 | } | 64 | } |
65 | 65 | ||
66 | OpenSimRoot.Instance.StartUp(); | ||
67 | |||
68 | if (sim.loginserver && sim.sandbox) | 66 | if (sim.loginserver && sim.sandbox) |
69 | { | 67 | { |
70 | LoginServer loginServer = new LoginServer(OpenSimRoot.Instance.GridServers.GridServer, OpenSimRoot.Instance.Cfg.IPListenAddr, OpenSimRoot.Instance.Cfg.IPListenPort); | 68 | LoginServer loginServer = new LoginServer(OpenSimRoot.Instance.GridServers.GridServer); |
71 | loginServer.Startup(); | 69 | loginServer.Startup(); |
72 | } | 70 | } |
73 | 71 | ||
72 | OpenSimRoot.Instance.StartUp(); | ||
73 | |||
74 | while (true) | 74 | while (true) |
75 | { | 75 | { |
76 | OpenSim.Framework.Console.MainConsole.Instance.MainConsolePrompt(); | 76 | OpenSim.Framework.Console.MainConsole.Instance.MainConsolePrompt(); |