1 files changed, 20 insertions, 8 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
index 221f815..2238c90 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
@@ -67,10 +67,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
         {
             if (sp.PresenceType != PresenceType.Npc)
             {
-                string userid = sp.Scene.UserManagementModule.GetUserUUI(sp.UUID);
+                string userid;
                 //m_log.DebugFormat("[ACTIVITY DETECTOR]: Detected root presence {0} in {1}", userid, sp.Scene.RegionInfo.RegionName);
-                m_GridUserService.SetLastPosition(
-                    userid, UUID.Zero, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
+                if (sp.Scene.UserManagementModule.GetUserUUI(sp.UUID, out userid))
+                {
+                    /* we only setposition on known agents that have a valid lookup */
+                    m_GridUserService.SetLastPosition(
+                        userid, UUID.Zero, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
+                }
             }
         }
 
@@ -81,20 +85,28 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
 
         public void OnConnectionClose(IClientAPI client)
         {
+            if (client == null)
+                return;
+            if (client.SceneAgent == null)
+                return;
+
             if (client.SceneAgent.IsChildAgent)
                 return;
 
-            string userId = client.AgentId.ToString();
+            string userId;
+            /* without scene we cannot logout correctly at all since we do not know how to send the loggedout message then */
             if (client.Scene is Scene)
             {
                 Scene s = (Scene)client.Scene;
                 userId = s.UserManagementModule.GetUserUUI(client.AgentId);
+                if(s.UserManagementModule.GetUserUUI(client.AgentId, out userId))
+                {
+                    m_GridUserService.LoggedOut(
+                        userId, client.SessionId, client.Scene.RegionInfo.RegionID,
+                        client.SceneAgent.AbsolutePosition, client.SceneAgent.Lookat);
+                }
             }
-            //m_log.DebugFormat("[ACTIVITY DETECTOR]: Detected client logout {0} in {1}", userId, client.Scene.RegionInfo.RegionName);
 
-            m_GridUserService.LoggedOut(
-                userId, client.SessionId, client.Scene.RegionInfo.RegionID,
-                client.SceneAgent.AbsolutePosition, client.SceneAgent.Lookat);
         }
     }
 }