1 files changed, 24 insertions, 1 deletions

diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 53a3c2f..cad0988 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -390,7 +390,30 @@ namespace OpenSim.Services.LLLoginService
                 {
                     if(guinfo != null && guinfo.Online && guinfo.LastRegionID != UUID.Zero)
                     {
-                        if(SendAgentGodKillToRegion(scopeID, account.PrincipalID, guinfo))
+                        // Also check Presence.UserID if RegionID == UUID.Zero, they are a ghost.
+                        // Ghosting might be caused by failure to call PresenceService.LogoutAgent() on logout / crash / failed login.
+                        // Might also need to double check if they are out hypergridding.
+
+                        success = false;
+                        if (m_PresenceService != null)
+                        {
+                            PresenceInfo pi = m_PresenceService.GetAgentByUser(account.PrincipalID);
+                            if (null != pi)
+                            {
+                                Dictionary<string, object> pid = pi.ToKeyValuePairs();
+                                if (pid["RegionID"].ToString() == UUID.Zero.ToString())
+                                {
+                                    m_log.WarnFormat("[LLOGIN SERVICE]: Exorcising ghost avatar {0} {1}, session {2}, new session {3}.", firstName, lastName, pid["SessionID"], session);
+                                    success = m_PresenceService.LogoutAgent(new UUID(pid["SessionID"].ToString()));
+                                    if (success)
+                                        m_log.WarnFormat("[LLOGIN SERVICE]: Ghost avatar exorcised {0} {1}, session {2}, new session {3}.", firstName, lastName, pid["SessionID"], session);
+                                    else
+                                        m_log.ErrorFormat("[LLOGIN SERVICE]: Ghost avatar not exorcised {0} {1}, session {2}, new session {3}!", firstName, lastName, pid["SessionID"], session);
+                                }
+                            }
+                        }
+
+                        if ((!success) && SendAgentGodKillToRegion(scopeID, account.PrincipalID, guinfo))
                         {
                             m_log.InfoFormat(
                                 "[LLOGIN SERVICE]: Login failed for {0} {1}, reason: already logged in",