2 files changed, 74 insertions, 7 deletions

diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index 8472571..5568f73 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -88,6 +88,10 @@ namespace OpenSim.Grid.MessagingServer
                 m_httpServer.AddXmlRPCHandler("login_to_simulator", msgsvc.UserLoggedOn);
                 m_httpServer.AddXmlRPCHandler("logout_of_simulator", msgsvc.UserLoggedOff);
                 m_httpServer.AddXmlRPCHandler("get_presence_info_bulk", msgsvc.GetPresenceInfoBulk);
+                m_httpServer.AddXmlRPCHandler("region_startup", msgsvc.RegionStartup);
+                m_httpServer.AddXmlRPCHandler("region_shutdown", msgsvc.RegionShutdown);
+                m_httpServer.AddXmlRPCHandler("agent_location", msgsvc.AgentLocation);
+                m_httpServer.AddXmlRPCHandler("agent_leaving", msgsvc.AgentLeaving);
 
                 m_httpServer.Start();
                 m_log.Info("[SERVER]: Userserver registration was successful");
diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs
index 66916b6..a4e54c7 100644
--- a/OpenSim/Grid/MessagingServer/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer/MessageService.cs
@@ -558,24 +558,30 @@ namespace OpenSim.Grid.MessagingServer
 
         public bool deregisterWithUserServer()
         {
-            Hashtable UserParams = new Hashtable();
+            Hashtable request = new Hashtable();
+
+            return SendToUserServer(request, "deregister_messageserver");
+        }
+
+        public bool SendToUserServer(Hashtable request, string method)
+        {
             // Login / Authentication
 
             if (m_cfg.HttpSSL)
             {
-                UserParams["uri"] = "https://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
+                request["uri"] = "https://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
             }
             else
             {
-                UserParams["uri"] = "http://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
+                request["uri"] = "http://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
             }
 
-            UserParams["recvkey"] = m_cfg.UserRecvKey;
-            UserParams["sendkey"] = m_cfg.UserRecvKey;
+            request["recvkey"] = m_cfg.UserRecvKey;
+            request["sendkey"] = m_cfg.UserRecvKey;
 
             // Package into an XMLRPC Request
             ArrayList SendParams = new ArrayList();
-            SendParams.Add(UserParams);
+            SendParams.Add(request);
 
             bool success = true;
             string[] servers = m_cfg.UserServerURL.Split(' ');
@@ -585,7 +591,7 @@ namespace OpenSim.Grid.MessagingServer
             {
                 try
                 {
-                    XmlRpcRequest UserReq = new XmlRpcRequest("deregister_messageserver", SendParams);
+                    XmlRpcRequest UserReq = new XmlRpcRequest(method, SendParams);
                     XmlRpcResponse UserResp = UserReq.Send(m_cfg.UserServerURL, 16000);
                     // Process Response
                     Hashtable UserRespData = (Hashtable)UserResp.Value;
@@ -603,5 +609,62 @@ namespace OpenSim.Grid.MessagingServer
         }
 
         #endregion
+
+        public XmlRpcResponse RegionStartup(XmlRpcRequest request)
+        {
+            Hashtable requestData = (Hashtable)request.Params[0];
+            Hashtable result = new Hashtable();
+            result["success"] = "FALSE";
+
+            if(SendToUserServer(requestData, "region_startup"))
+                result["success"] = "TRUE";
+
+            XmlRpcResponse response = new XmlRpcResponse();
+            response.Value = result;
+            return response;
+        }
+
+        public XmlRpcResponse RegionShutdown(XmlRpcRequest request)
+        {
+            Hashtable requestData = (Hashtable)request.Params[0];
+            Hashtable result = new Hashtable();
+            result["success"] = "FALSE";
+
+            if(SendToUserServer(requestData, "region_shutdown"))
+                result["success"] = "TRUE";
+
+            XmlRpcResponse response = new XmlRpcResponse();
+            response.Value = result;
+            return response;
+        }
+
+        public XmlRpcResponse AgentLocation(XmlRpcRequest request)
+        {
+            Hashtable requestData = (Hashtable)request.Params[0];
+            Hashtable result = new Hashtable();
+            result["success"] = "FALSE";
+
+            if(SendToUserServer(requestData, "agent_location"))
+                result["success"] = "TRUE";
+
+
+            XmlRpcResponse response = new XmlRpcResponse();
+            response.Value = result;
+            return response;
+        }
+
+        public XmlRpcResponse AgentLeaving(XmlRpcRequest request)
+        {
+            Hashtable requestData = (Hashtable)request.Params[0];
+            Hashtable result = new Hashtable();
+            result["success"] = "FALSE";
+
+            if(SendToUserServer(requestData, "agent_leaving"))
+                result["success"] = "TRUE";
+
+            XmlRpcResponse response = new XmlRpcResponse();
+            response.Value = result;
+            return response;
+        }
     }
 }