aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSimMain.cs
diff options
context:
space:
mode:
authorMW2007-05-17 10:24:10 +0000
committerMW2007-05-17 10:24:10 +0000
commitaae0222f8154a32d71112a8a468412efa5b857da (patch)
tree30342f61cf94448396b87794bf25c40522417403 /OpenSim/OpenSimMain.cs
parentImplemented initial login code for the management agent (diff)
downloadopensim-SC_OLD-aae0222f8154a32d71112a8a468412efa5b857da.zip
opensim-SC_OLD-aae0222f8154a32d71112a8a468412efa5b857da.tar.gz
opensim-SC_OLD-aae0222f8154a32d71112a8a468412efa5b857da.tar.bz2
opensim-SC_OLD-aae0222f8154a32d71112a8a468412efa5b857da.tar.xz
More OO and abstract goodness for Gareth to drool over. Cleaned up the World class a bit and added a WorldBase class (that World now inherits from)
Diffstat (limited to '')
-rw-r--r--OpenSim/OpenSimMain.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/OpenSimMain.cs b/OpenSim/OpenSimMain.cs
index 8da76ca..0b614f8 100644
--- a/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSimMain.cs
@@ -144,6 +144,7 @@ namespace OpenSim
144 144
145 this.SetupHttpListener(); 145 this.SetupHttpListener();
146 146
147 //Login server setup
147 LoginServer loginServer = null; 148 LoginServer loginServer = null;
148 LoginServer adminLoginServer = null; 149 LoginServer adminLoginServer = null;
149 150
@@ -169,13 +170,15 @@ namespace OpenSim
169 } 170 }
170 } 171 }
171 172
173 //Web front end setup
172 AdminWebFront adminWebFront = new AdminWebFront("Admin", LocalWorld, InventoryCache, adminLoginServer); 174 AdminWebFront adminWebFront = new AdminWebFront("Admin", LocalWorld, InventoryCache, adminLoginServer);
173 adminWebFront.LoadMethods(httpServer); 175 adminWebFront.LoadMethods(httpServer);
174 176
177 //Start http server
175 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting HTTP server"); 178 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting HTTP server");
176 httpServer.Start(); 179 httpServer.Start();
177 180
178 //MainServerListener(); 181 // Start UDP server
179 this.m_udpServer.ServerListener(); 182 this.m_udpServer.ServerListener();
180 183
181 m_heartbeatTimer.Enabled = true; 184 m_heartbeatTimer.Enabled = true;