From d1c9a41be0c3648251259f955f31cf7a4135e7f7 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Tue, 5 May 2009 04:37:06 +0000 Subject: Plumb the new server connector logic --- OpenSim/Servers/User/UserServerMain.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'OpenSim/Servers/User/UserServerMain.cs') diff --git a/OpenSim/Servers/User/UserServerMain.cs b/OpenSim/Servers/User/UserServerMain.cs index d4f5e6d..7dea5d7 100644 --- a/OpenSim/Servers/User/UserServerMain.cs +++ b/OpenSim/Servers/User/UserServerMain.cs @@ -28,16 +28,21 @@ using System; using OpenSim.Servers.Base; -namespace OpenSim.Servers.Base +namespace OpenSim.Servers.UserServer { - public class SimpleServer + public class UserServer { - protected static ServicesServerBase m_Server = null; + protected static HttpServerBase m_Server = null; + + protected static UserServiceConnector m_UserServiceConnector; static int Main(string[] args) { m_Server = new HttpServerBase("User", args); + m_UserServiceConnector = new UserServiceConnector(m_Server.Config, + m_Server.HttpServer); + return m_Server.Run(); } } -- cgit v1.1