diff options
Separated Login Service from usermanager, which helps to clean up the code a bit and also should help to integrate the inventory server (when it is wrote/finished).
Diffstat (limited to 'OpenSim/Grid/UserServer/Main.cs')
-rw-r--r-- | OpenSim/Grid/UserServer/Main.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index 04f45b0..82bbd57 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
@@ -47,6 +47,7 @@ namespace OpenSim.Grid.UserServer | |||
47 | private UserConfig Cfg; | 47 | private UserConfig Cfg; |
48 | 48 | ||
49 | public UserManager m_userManager; | 49 | public UserManager m_userManager; |
50 | public UserLoginService m_loginService; | ||
50 | 51 | ||
51 | public Dictionary<LLUUID, UserProfile> UserSessions = new Dictionary<LLUUID, UserProfile>(); | 52 | public Dictionary<LLUUID, UserProfile> UserSessions = new Dictionary<LLUUID, UserProfile>(); |
52 | 53 | ||
@@ -92,10 +93,12 @@ namespace OpenSim.Grid.UserServer | |||
92 | m_userManager._config = Cfg; | 93 | m_userManager._config = Cfg; |
93 | m_userManager.AddPlugin(Cfg.DatabaseProvider); | 94 | m_userManager.AddPlugin(Cfg.DatabaseProvider); |
94 | 95 | ||
96 | m_loginService = new UserLoginService(m_userManager, Cfg, Cfg.DefaultStartupMsg); | ||
97 | |||
95 | MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process"); | 98 | MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process"); |
96 | BaseHttpServer httpServer = new BaseHttpServer(8002); | 99 | BaseHttpServer httpServer = new BaseHttpServer(8002); |
97 | 100 | ||
98 | httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod); | 101 | httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod); |
99 | 102 | ||
100 | httpServer.AddXmlRPCHandler("get_user_by_name", m_userManager.XmlRPCGetUserMethodName); | 103 | httpServer.AddXmlRPCHandler("get_user_by_name", m_userManager.XmlRPCGetUserMethodName); |
101 | httpServer.AddXmlRPCHandler("get_user_by_uuid", m_userManager.XmlRPCGetUserMethodUUID); | 104 | httpServer.AddXmlRPCHandler("get_user_by_uuid", m_userManager.XmlRPCGetUserMethodUUID); |