aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Servers/User/UserServerMain.cs
diff options
context:
space:
mode:
authorMelanie Thielker2009-05-05 04:37:06 +0000
committerMelanie Thielker2009-05-05 04:37:06 +0000
commitd1c9a41be0c3648251259f955f31cf7a4135e7f7 (patch)
treebe74fc2c39b668577e0b43d05fec2fd2291e9323 /OpenSim/Servers/User/UserServerMain.cs
parentCommitting the user server executable skeleton (diff)
downloadopensim-SC-d1c9a41be0c3648251259f955f31cf7a4135e7f7.zip
opensim-SC-d1c9a41be0c3648251259f955f31cf7a4135e7f7.tar.gz
opensim-SC-d1c9a41be0c3648251259f955f31cf7a4135e7f7.tar.bz2
opensim-SC-d1c9a41be0c3648251259f955f31cf7a4135e7f7.tar.xz
Plumb the new server connector logic
Diffstat (limited to 'OpenSim/Servers/User/UserServerMain.cs')
-rw-r--r--OpenSim/Servers/User/UserServerMain.cs11
1 files changed, 8 insertions, 3 deletions
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 @@
28using System; 28using System;
29using OpenSim.Servers.Base; 29using OpenSim.Servers.Base;
30 30
31namespace OpenSim.Servers.Base 31namespace OpenSim.Servers.UserServer
32{ 32{
33 public class SimpleServer 33 public class UserServer
34 { 34 {
35 protected static ServicesServerBase m_Server = null; 35 protected static HttpServerBase m_Server = null;
36
37 protected static UserServiceConnector m_UserServiceConnector;
36 38
37 static int Main(string[] args) 39 static int Main(string[] args)
38 { 40 {
39 m_Server = new HttpServerBase("User", args); 41 m_Server = new HttpServerBase("User", args);
40 42
43 m_UserServiceConnector = new UserServiceConnector(m_Server.Config,
44 m_Server.HttpServer);
45
41 return m_Server.Run(); 46 return m_Server.Run();
42 } 47 }
43 } 48 }