Bandaid for ghost users, check and remove them from Presence when they log on.

Once again OOP proves it's worse that spaghetti, but cutting up the
spaghetti and hiding it all over the kitchen.

Note the commented out bits from GateKeeperService.cs, this stuff is
checked TWICE, though this time is for HGers, or not.

1 files changed, 11 insertions, 0 deletions

diff --git a/OpenSim/Services/Interfaces/IPresenceService.cs b/OpenSim/Services/Interfaces/IPresenceService.cs
index 90f9842..4843759 100644
--- a/OpenSim/Services/Interfaces/IPresenceService.cs
+++ b/OpenSim/Services/Interfaces/IPresenceService.cs
@@ -36,6 +36,7 @@ namespace OpenSim.Services.Interfaces
     {
         public string UserID;
         public UUID RegionID;
+        public UUID SessionID;
 
         public PresenceInfo()
         {
@@ -47,6 +48,8 @@ namespace OpenSim.Services.Interfaces
                 UserID = kvp["UserID"].ToString();
             if (kvp.ContainsKey("RegionID"))
                 UUID.TryParse(kvp["RegionID"].ToString(), out RegionID);
+            if (kvp.ContainsKey("SessionID"))
+                UUID.TryParse(kvp["SessionID"].ToString(), out SessionID);
         }
 
         public Dictionary<string, object> ToKeyValuePairs()
@@ -54,6 +57,7 @@ namespace OpenSim.Services.Interfaces
             Dictionary<string, object> result = new Dictionary<string, object>();
             result["UserID"] = UserID;
             result["RegionID"] = RegionID.ToString();
+            result["SessionID"] = SessionID.ToString();
 
             return result;
         }
@@ -100,6 +104,13 @@ namespace OpenSim.Services.Interfaces
         PresenceInfo GetAgent(UUID sessionID);
 
         /// <summary>
+        /// Get session information for a given session ID.
+        /// </summary>
+        /// <returns></returns>
+        /// <param name='sessionID'></param>
+        PresenceInfo GetAgentByUser(UUID userID);
+
+        /// <summary>
         /// Get session information for a collection of users.
         /// </summary>
         /// <returns>Session information for the users.</returns>