Plumb in the presence notifications and region shutdown/restart messages

from the presence module to the message server, through the user server
and on into the database. This should fix the "Already logged in" issue
that grids see after a sim crashes, or a user crashes out of a sim.
Not yet a 100% solution for friends, but getting there.

1 files changed, 29 insertions, 0 deletions

diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index eb47259..f894ca0 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -110,6 +110,11 @@ namespace OpenSim.Grid.UserServer
             m_loginService.OnUserLoggedInAtLocation += NotifyMessageServersUserLoggedInToLocation;
             m_userManager.OnLogOffUser += NotifyMessageServersUserLoggOff;
 
+            m_messagesService.OnAgentLocation += HandleAgentLocation;
+            m_messagesService.OnAgentLeaving += HandleAgentLeaving;
+            m_messagesService.OnRegionStartup += HandleRegionStartup;
+            m_messagesService.OnRegionShutdown += HandleRegionShutdown;
+
             m_log.Info("[REGION]: Starting HTTP process");
 
             m_httpServer = new BaseHttpServer(Cfg.HttpPort);
@@ -147,6 +152,10 @@ namespace OpenSim.Grid.UserServer
             m_httpServer.AddXmlRPCHandler("get_agent_by_uuid", m_userManager.XmlRPCGetAgentMethodUUID);
             m_httpServer.AddXmlRPCHandler("check_auth_session", m_userManager.XmlRPCCheckAuthSession);
             m_httpServer.AddXmlRPCHandler("set_login_params", m_loginService.XmlRPCSetLoginParams);
+            m_httpServer.AddXmlRPCHandler("region_startup", m_messagesService.RegionStartup);
+            m_httpServer.AddXmlRPCHandler("region_shutdown", m_messagesService.RegionShutdown);
+            m_httpServer.AddXmlRPCHandler("agent_location", m_messagesService.AgentLocation);
+            m_httpServer.AddXmlRPCHandler("agent_leaving", m_messagesService.AgentLeaving);
             // Message Server ---> User Server
             m_httpServer.AddXmlRPCHandler("register_messageserver", m_messagesService.XmlRPCRegisterMessageServer);
             m_httpServer.AddXmlRPCHandler("agent_change_region", m_messagesService.XmlRPCUserMovedtoRegion);
@@ -442,5 +451,25 @@ namespace OpenSim.Grid.UserServer
             m_messagesService.TellMessageServersAboutUser(agentID, sessionID, RegionID, regionhandle, positionX,
                                                           positionY, positionZ, firstname, lastname);
         }
+
+        public void HandleAgentLocation(UUID agentID, UUID regionID, ulong regionHandle)
+        {
+            m_userManager.HandleAgentLocation(agentID, regionID, regionHandle);
+        }
+
+        public void HandleAgentLeaving(UUID agentID, UUID regionID, ulong regionHandle)
+        {
+            m_userManager.HandleAgentLeaving(agentID, regionID, regionHandle);
+        }
+
+        public void HandleRegionStartup(UUID regionID)
+        {
+            m_userManager.HandleRegionStartup(regionID);
+        }
+
+        public void HandleRegionShutdown(UUID regionID)
+        {
+            m_userManager.HandleRegionShutdown(regionID);
+        }
     }
 }