From b8efd5f2949dd247590c1e40509e71031faf3413 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Sun, 6 Jan 2008 18:18:19 +0000 Subject: * Added some userserver glue for communications with the message server * Added some code for the message server, fixed a few references and starting to flesh it out. --- OpenSim/Grid/UserServer/Main.cs | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'OpenSim/Grid/UserServer/Main.cs') diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index 5264870..8e6817d 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs @@ -42,9 +42,11 @@ namespace OpenSim.Grid.UserServer public class OpenUser_Main : conscmd_callback { private UserConfig Cfg; + public UserManager m_userManager; public UserLoginService m_loginService; + public MessageServersConnector m_messagesService; private LogBase m_console; private LLUUID m_lastCreatedUser = LLUUID.Random(); @@ -93,6 +95,10 @@ namespace OpenSim.Grid.UserServer m_loginService = new UserLoginService( m_userManager, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg); + m_messagesService = new MessageServersConnector(MainLog.Instance); + + m_loginService.OnUserLoggedInAtLocation += NotifyMessageServersUserLoggedInToLocation; + MainLog.Instance.Verbose("REGION", "Starting HTTP process"); BaseHttpServer httpServer = new BaseHttpServer(Cfg.HttpPort); @@ -106,7 +112,12 @@ namespace OpenSim.Grid.UserServer httpServer.AddXmlRPCHandler("remove_user_friend", m_userManager.XmlRpcResponseXmlRPCRemoveUserFriend); httpServer.AddXmlRPCHandler("update_user_friend_perms", m_userManager.XmlRpcResponseXmlRPCUpdateUserFriendPerms); httpServer.AddXmlRPCHandler("get_user_friend_list", m_userManager.XmlRpcResponseXmlRPCGetUserFriendList); - + + // Message Server ---> User Server + httpServer.AddXmlRPCHandler("register_messageserver", m_messagesService.XmlRPCRegisterMessageServer); + httpServer.AddXmlRPCHandler("agent_change_region", m_messagesService.XmlRPCUserMovedtoRegion); + httpServer.AddXmlRPCHandler("deregister_messageserver", m_messagesService.XmlRPCDeRegisterMessageServer); + httpServer.AddStreamHandler( new RestStreamHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod)); @@ -173,6 +184,7 @@ namespace OpenSim.Grid.UserServer break; case "shutdown": + m_loginService.OnUserLoggedInAtLocation -= NotifyMessageServersUserLoggedInToLocation; m_console.Close(); Environment.Exit(0); break; @@ -196,6 +208,10 @@ namespace OpenSim.Grid.UserServer { Console.WriteLine("response got"); } + public void NotifyMessageServersUserLoggedInToLocation(LLUUID agentID, LLUUID sessionID, LLUUID RegionID, ulong regionhandle, LLVector3 Position) + { + m_messagesService.TellMessageServersAboutUser(agentID, sessionID, RegionID, regionhandle, Position); + } /*private void ConfigDB(IGenericConfig configData) { -- cgit v1.1