aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorlbsa712007-03-27 20:33:02 +0000
committerlbsa712007-03-27 20:33:02 +0000
commit64aa87765b1e215fd8cc7c81d35b70a4c4bd8721 (patch)
tree3a58d1156aa0e0a55f59c2ea95ec3ec5f65f9c21 /OpenSim
parent* vaseline + duct-tape. (diff)
downloadopensim-SC_OLD-64aa87765b1e215fd8cc7c81d35b70a4c4bd8721.zip
opensim-SC_OLD-64aa87765b1e215fd8cc7c81d35b70a4c4bd8721.tar.gz
opensim-SC_OLD-64aa87765b1e215fd8cc7c81d35b70a4c4bd8721.tar.bz2
opensim-SC_OLD-64aa87765b1e215fd8cc7c81d35b70a4c4bd8721.tar.xz
* Config should be loaded before login server startup...
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/RegionServer.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/RegionServer.cs b/OpenSim/RegionServer.cs
index 180bdbd..a0037b1 100644
--- a/OpenSim/RegionServer.cs
+++ b/OpenSim/RegionServer.cs
@@ -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
66 if (sim.loginserver && sim.sandbox) 68 if (sim.loginserver && sim.sandbox)
67 { 69 {
68 LoginServer loginServer = new LoginServer(OpenSimRoot.Instance.GridServers.GridServer, OpenSimRoot.Instance.Cfg.IPListenAddr, OpenSimRoot.Instance.Cfg.IPListenPort); 70 LoginServer loginServer = new LoginServer(OpenSimRoot.Instance.GridServers.GridServer, OpenSimRoot.Instance.Cfg.IPListenAddr, OpenSimRoot.Instance.Cfg.IPListenPort);
69 loginServer.Startup(); 71 loginServer.Startup();
70 } 72 }
71 73
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();