Merge branch 'SledjChisl'

1 files changed, 21 insertions, 4 deletions

diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs
index b5ca4d5..1059b2b 100644
--- a/OpenSim/Services/PresenceService/PresenceService.cs
+++ b/OpenSim/Services/PresenceService/PresenceService.cs
@@ -71,7 +71,7 @@ namespace OpenSim.Services.PresenceService
             data.SessionID = sessionID;
             data.Data = new Dictionary<string, string>();
             data.Data["SecureSessionID"] = secureSessionID.ToString();
-            
+
             m_Database.Store(data);
 
             string prevUserStr = "";
@@ -80,7 +80,7 @@ namespace OpenSim.Services.PresenceService
 
             m_log.DebugFormat("[PRESENCE SERVICE]: LoginAgent: session {0}, user {1}, region {2}, secure session {3}{4}",
                 data.SessionID, data.UserID, data.RegionID, secureSessionID, prevUserStr);
-            
+
             return true;
         }
 
@@ -92,7 +92,7 @@ namespace OpenSim.Services.PresenceService
                 sessionID,
                 (presence == null) ? null : presence.UserID,
                 (presence == null) ? null : presence.RegionID.ToString());
-            
+
             return m_Database.Delete("SessionID", sessionID.ToString());
         }
 
@@ -144,13 +144,29 @@ namespace OpenSim.Services.PresenceService
         public PresenceInfo GetAgent(UUID sessionID)
         {
             PresenceInfo ret = new PresenceInfo();
-            
+
             PresenceData data = m_Database.Get(sessionID);
             if (data == null)
                 return null;
 
             ret.UserID = data.UserID;
             ret.RegionID = data.RegionID;
+            ret.SessionID = data.SessionID;
+
+            return ret;
+        }
+
+        public PresenceInfo GetAgentByUser(UUID userID)
+        {
+            PresenceInfo ret = new PresenceInfo();
+
+            PresenceData data = m_Database.GetByUser(userID);
+            if (data == null)
+                return null;
+
+            ret.UserID = data.UserID;
+            ret.RegionID = data.RegionID;
+            ret.SessionID = data.SessionID;
 
             return ret;
         }
@@ -169,6 +185,7 @@ namespace OpenSim.Services.PresenceService
 
                     ret.UserID = d.UserID;
                     ret.RegionID = d.RegionID;
+                    ret.SessionID = d.SessionID;
 
                     info.Add(ret);
                 }