4 files changed, 113 insertions, 20 deletions

diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 3a3b8b6..fcf9de6 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -98,6 +98,7 @@ namespace OpenSim.Grid.UserServer
             m_messagesService = new MessageServersConnector();
 
             m_loginService.OnUserLoggedInAtLocation += NotifyMessageServersUserLoggedInToLocation;
+            m_userManager.OnLogOffUser += NotifyMessageServersUserLoggOff;
 
             m_log.Info("[REGION]: Starting HTTP process");
             BaseHttpServer httpServer = new BaseHttpServer(Cfg.HttpPort);
@@ -225,10 +226,18 @@ namespace OpenSim.Grid.UserServer
             m_console.Notice("response got");
         }
 
-        public void NotifyMessageServersUserLoggedInToLocation(LLUUID agentID, LLUUID sessionID, LLUUID RegionID, ulong regionhandle, LLVector3 Position)
+        public void NotifyMessageServersUserLoggOff(LLUUID agentID)
+        {
+            m_messagesService.TellMessageServersAboutUserLogoff(agentID);
+        }
+
+        public void NotifyMessageServersUserLoggedInToLocation(LLUUID agentID, LLUUID sessionID, LLUUID RegionID,
+                                                                ulong regionhandle, float positionX, float positionY, 
+                                                                float positionZ, string firstname, string lastname)
         {
             
-            m_messagesService.TellMessageServersAboutUser(agentID, sessionID, RegionID, regionhandle, Position);
+            m_messagesService.TellMessageServersAboutUser( agentID, sessionID, RegionID, regionhandle, positionX,
+                positionY,  positionZ, firstname, lastname);
         }
 
         /*private void ConfigDB(IGenericConfig configData)
diff --git a/OpenSim/Grid/UserServer/MessageServersConnector.cs b/OpenSim/Grid/UserServer/MessageServersConnector.cs
index 6535247..79d1147 100644
--- a/OpenSim/Grid/UserServer/MessageServersConnector.cs
+++ b/OpenSim/Grid/UserServer/MessageServersConnector.cs
@@ -52,12 +52,20 @@ namespace OpenSim.Grid.UserServer
         
         public void RegisterMessageServer(string URI, MessageServerInfo serverData)
         {
-            MessageServers.Add(URI, serverData);
+            lock (MessageServers)
+            {
+                if (!MessageServers.ContainsKey(URI))
+                    MessageServers.Add(URI, serverData);
+            }
         }
         
         public void DeRegisterMessageServer(string URI)
         {
-            MessageServers.Remove(URI);
+            lock (MessageServers)
+            {
+                if (MessageServers.ContainsKey(URI))
+                    MessageServers.Remove(URI);
+            }
         }
         
         public void AddResponsibleRegion(string URI, ulong regionhandle)
@@ -150,24 +158,73 @@ namespace OpenSim.Grid.UserServer
             return response;
         }
 
-        public void TellMessageServersAboutUser(LLUUID agentID, LLUUID sessionID, LLUUID RegionID, ulong regionhandle, LLVector3 Position)
+        public void TellMessageServersAboutUser(LLUUID agentID, LLUUID sessionID, LLUUID RegionID,
+                                                ulong regionhandle, float positionX, float positionY, 
+                                                float positionZ, string firstname, string lastname)
         {
             // Loop over registered Message Servers ( AND THERE WILL BE MORE THEN ONE :D )
-            if (MessageServers.Count > 0)
+            lock (MessageServers)
             {
-                m_log.Info("[MSGCONNECTOR]: Sending login notice to registered message servers");
+                if (MessageServers.Count > 0)
+                {
+                    m_log.Info("[MSGCONNECTOR]: Sending login notice to registered message servers");
+                }
+                else
+                {
+                    m_log.Info("[MSGCONNECTOR]: No Message Servers registered, ignoring");
+                }
+                foreach (MessageServerInfo serv in MessageServers.Values)
+                {
+                    NotifyMessageServerAboutUser(serv, agentID, sessionID, RegionID,
+                                                regionhandle, positionX, positionY, positionZ,
+                                                firstname, lastname);
+                }
             }
-            else
+        }
+
+        public void TellMessageServersAboutUserLogoff(LLUUID agentID)
+        {
+            lock (MessageServers)
+            {
+                if (MessageServers.Count > 0)
+                {
+                    m_log.Info("[MSGCONNECTOR]: Sending login notice to registered message servers");
+                }
+                else
+                {
+                    m_log.Info("[MSGCONNECTOR]: No Message Servers registered, ignoring");
+                }
+                foreach (MessageServerInfo serv in MessageServers.Values)
+                {
+                    NotifyMessageServerAboutUserLogoff(serv,agentID);
+                }
+            }
+        }
+
+        private void NotifyMessageServerAboutUserLogoff(MessageServerInfo serv, LLUUID agentID)
+        {
+            Hashtable reqparams = new Hashtable();
+            reqparams["sendkey"] = serv.sendkey;
+            reqparams["agentid"] = agentID.ToString();
+            ArrayList SendParams = new ArrayList();
+            SendParams.Add(reqparams);
+
+            XmlRpcRequest GridReq = new XmlRpcRequest("logout_of_simulator", SendParams);
+            try
             {
-                m_log.Info("[MSGCONNECTOR]: No Message Servers registered, ignoring");
+                XmlRpcResponse GridResp = GridReq.Send(serv.URI, 6000);
             }
-            foreach (MessageServerInfo serv in MessageServers.Values)
+            catch (System.Net.WebException)
             {
-                NotifyMessageServerAboutUser(serv, agentID, sessionID, RegionID, regionhandle, Position);
+                m_log.Warn("[MSGCONNECTOR]: Unable to notify Message Server about log out.  Other users might still think this user is online");
             }
+            m_log.Info("[LOGOUT]: Notified : " + serv.URI + " about user logout");
         }
 
-        private void NotifyMessageServerAboutUser(MessageServerInfo serv, LLUUID agentID, LLUUID sessionID, LLUUID RegionID, ulong regionhandle, LLVector3 Position)
+        private void NotifyMessageServerAboutUser(MessageServerInfo serv, 
+                                                    LLUUID agentID, LLUUID sessionID, LLUUID RegionID,
+                                                    ulong regionhandle, float positionX, float positionY, float positionZ, 
+                                                    string firstname, string lastname)
         {
             Hashtable reqparams = new Hashtable();
             reqparams["sendkey"] = serv.sendkey;
@@ -175,14 +232,28 @@ namespace OpenSim.Grid.UserServer
             reqparams["sessionid"] = sessionID.ToString();
             reqparams["regionid"] = RegionID.ToString();
             reqparams["regionhandle"] = regionhandle.ToString();
-            reqparams["position"] = Position.ToString();
+            reqparams["positionx"] = positionX.ToString();
+            reqparams["positiony"] = positionY.ToString();
+            reqparams["positionz"] = positionZ.ToString();
+            reqparams["firstname"] = firstname;
+            reqparams["lastname"] = lastname;
+
+            //reqparams["position"] = Position.ToString();
 
             ArrayList SendParams = new ArrayList();
             SendParams.Add(reqparams);
 
             XmlRpcRequest GridReq = new XmlRpcRequest("login_to_simulator", SendParams);
-            XmlRpcResponse GridResp = GridReq.Send(serv.URI, 6000);
-            m_log.Info("[LOGIN]: Notified : " + serv.URI + " about user login");
+            try
+            {
+                XmlRpcResponse GridResp = GridReq.Send(serv.URI, 6000);
+                m_log.Info("[LOGIN]: Notified : " + serv.URI + " about user login");
+            }
+            catch (System.Net.WebException)
+            {
+                m_log.Warn("[MSGCONNECTOR]: Unable to notify Message Server about login.  Presence might be borked for this user");
+            }
+            
         }
     }
 }
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index a82b978..143c990 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -44,7 +44,9 @@ using InventoryFolder=OpenSim.Framework.InventoryFolder;
 
 namespace OpenSim.Grid.UserServer
 {
-    public delegate void UserLoggedInAtLocation(LLUUID agentID, LLUUID sessionID, LLUUID RegionID, ulong regionhandle, LLVector3 Position);
+   
+    public delegate void UserLoggedInAtLocation(LLUUID agentID, LLUUID sessionID, LLUUID RegionID,
+    ulong regionhandle, float positionX, float positionY, float positionZ, string firstname, string lastname);
 
     public class UserLoginService : LoginService
     {
@@ -149,7 +151,9 @@ namespace OpenSim.Grid.UserServer
                 if (handler001 != null)
                 {
                     m_log.Info("[LOGIN]: Letting other objects know about login");
-                    handler001(theUser.UUID, theUser.currentAgent.sessionID, theUser.currentAgent.currentRegion, theUser.currentAgent.currentHandle, theUser.currentAgent.currentPos);
+                    handler001(theUser.UUID, theUser.currentAgent.sessionID, theUser.currentAgent.currentRegion, 
+                        theUser.currentAgent.currentHandle, theUser.currentAgent.currentPos.X,theUser.currentAgent.currentPos.Y,theUser.currentAgent.currentPos.Z,
+                        theUser.username,theUser.surname);
                 }
             }
             catch (Exception)
@@ -226,7 +230,9 @@ namespace OpenSim.Grid.UserServer
                     if (handler001 != null)
                     {
                         m_log.Info("[LOGIN]: Letting other objects know about login");
-                        handler001(theUser.UUID, theUser.currentAgent.sessionID, theUser.currentAgent.currentRegion, theUser.currentAgent.currentHandle, theUser.currentAgent.currentPos);
+                        handler001(theUser.UUID, theUser.currentAgent.sessionID, theUser.currentAgent.currentRegion,
+                        theUser.currentAgent.currentHandle, theUser.currentAgent.currentPos.X, theUser.currentAgent.currentPos.Y, theUser.currentAgent.currentPos.Z,
+                        theUser.username, theUser.surname);
                     }
                 }
 
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 8f2d83c..5806f5f 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -37,10 +37,13 @@ using OpenSim.Framework.UserManagement;
 
 namespace OpenSim.Grid.UserServer
 {
+    public delegate void logOffUser(LLUUID AgentID);
+
     public class UserManager : UserManagerBase
     {            
         private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-
+        public event logOffUser OnLogOffUser;
+        private logOffUser handler001 = null;
         /// <summary>
         /// Deletes an active agent session
         /// </summary>
@@ -327,7 +330,11 @@ namespace OpenSim.Grid.UserServer
                     float posx = (float)Convert.ToDecimal((string)requestData["region_pos_x"]);
                     float posy = (float)Convert.ToDecimal((string)requestData["region_pos_y"]);
                     float posz = (float)Convert.ToDecimal((string)requestData["region_pos_z"]);
-                    
+
+                    handler001 = OnLogOffUser;
+                    if (handler001 != null)
+                        handler001(userUUID);
+
                     LogOffUser(userUUID, RegionID, regionhandle, posx, posy, posz);
                 }
                 catch (FormatException)