4 files changed, 120 insertions, 20 deletions

diff --git a/OpenSim/Services/Connectors/Authentication/AuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/Authentication/AuthenticationServiceConnector.cs
index 50e817e..19bb3e2 100644
--- a/OpenSim/Services/Connectors/Authentication/AuthenticationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Authentication/AuthenticationServiceConnector.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Services.Connectors
 
         public string Authenticate(UUID principalID, string password, int lifetime)
         {
-            Dictionary<string, string> sendData = new Dictionary<string, string>();
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
             sendData["LIFETIME"] = lifetime.ToString();
             sendData["PRINCIPAL"] = principalID.ToString();
             sendData["PASSWORD"] = password;
@@ -106,7 +106,7 @@ namespace OpenSim.Services.Connectors
 
         public bool Verify(UUID principalID, string token, int lifetime)
         {
-            Dictionary<string, string> sendData = new Dictionary<string, string>();
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
             sendData["LIFETIME"] = lifetime.ToString();
             sendData["PRINCIPAL"] = principalID.ToString();
             sendData["TOKEN"] = token;
@@ -128,7 +128,7 @@ namespace OpenSim.Services.Connectors
 
         public bool Release(UUID principalID, string token)
         {
-            Dictionary<string, string> sendData = new Dictionary<string, string>();
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
             sendData["PRINCIPAL"] = principalID.ToString();
             sendData["TOKEN"] = token;
 
diff --git a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
index 02f2b79..99aa3fb 100644
--- a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Services.Connectors
         public virtual bool RegisterRegion(UUID scopeID, GridRegion regionInfo)
         {
             Dictionary<string, object> rinfo = regionInfo.ToKeyValuePairs();
-            Dictionary<string, string> sendData = new Dictionary<string,string>();
+            Dictionary<string, object> sendData = new Dictionary<string,object>();
             foreach (KeyValuePair<string, object> kvp in rinfo)
                 sendData[kvp.Key] = (string)kvp.Value;
 
@@ -130,7 +130,7 @@ namespace OpenSim.Services.Connectors
 
         public virtual bool DeregisterRegion(UUID regionID)
         {
-            Dictionary<string, string> sendData = new Dictionary<string, string>();
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
 
             sendData["REGIONID"] = regionID.ToString();
 
@@ -162,7 +162,7 @@ namespace OpenSim.Services.Connectors
 
         public virtual List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID)
         {
-            Dictionary<string, string> sendData = new Dictionary<string, string>();
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
 
             sendData["SCOPEID"] = scopeID.ToString();
             sendData["REGIONID"] = regionID.ToString();
@@ -212,7 +212,7 @@ namespace OpenSim.Services.Connectors
 
         public virtual GridRegion GetRegionByUUID(UUID scopeID, UUID regionID)
         {
-            Dictionary<string, string> sendData = new Dictionary<string, string>();
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
 
             sendData["SCOPEID"] = scopeID.ToString();
             sendData["REGIONID"] = regionID.ToString();
@@ -258,7 +258,7 @@ namespace OpenSim.Services.Connectors
 
         public virtual GridRegion GetRegionByPosition(UUID scopeID, int x, int y)
         {
-            Dictionary<string, string> sendData = new Dictionary<string, string>();
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
 
             sendData["SCOPEID"] = scopeID.ToString();
             sendData["X"] = x.ToString();
@@ -303,7 +303,7 @@ namespace OpenSim.Services.Connectors
 
         public virtual GridRegion GetRegionByName(UUID scopeID, string regionName)
         {
-            Dictionary<string, string> sendData = new Dictionary<string, string>();
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
 
             sendData["SCOPEID"] = scopeID.ToString();
             sendData["NAME"] = regionName;
@@ -344,7 +344,7 @@ namespace OpenSim.Services.Connectors
 
         public virtual List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber)
         {
-            Dictionary<string, string> sendData = new Dictionary<string, string>();
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
 
             sendData["SCOPEID"] = scopeID.ToString();
             sendData["NAME"] = name;
@@ -396,7 +396,7 @@ namespace OpenSim.Services.Connectors
 
         public virtual List<GridRegion> GetRegionRange(UUID scopeID, int xmin, int xmax, int ymin, int ymax)
         {
-            Dictionary<string, string> sendData = new Dictionary<string, string>();
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
 
             sendData["SCOPEID"] = scopeID.ToString();
             sendData["XMIN"] = xmin.ToString();
diff --git a/OpenSim/Services/Interfaces/IPresenceService.cs b/OpenSim/Services/Interfaces/IPresenceService.cs
index aa1c5bf..d86e50c 100644
--- a/OpenSim/Services/Interfaces/IPresenceService.cs
+++ b/OpenSim/Services/Interfaces/IPresenceService.cs
@@ -25,6 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
 using OpenSim.Framework;
 using System.Collections.Generic;
 using OpenMetaverse;
@@ -35,11 +36,24 @@ namespace OpenSim.Services.Interfaces
     {
         public UUID PrincipalID;
         public UUID RegionID;
-        public Dictionary<string, string> Data;
+        public UUID SessionID;
+        public UUID SecureSessionID;
+        public bool Online;
+        public DateTime Login;
+        public DateTime Logout;
+        public Vector3 Position;
+        public Vector3 LookAt;
     }
 
     public interface IPresenceService
     {
-        bool Report(PresenceInfo presence);
+        bool LoginAgent(UUID principalID, UUID sessionID, UUID secureSessionID);
+        bool LogoutAgent(UUID sessionID);
+        bool LogoutRegionAgents(UUID regionID);
+
+        bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt);
+
+        PresenceInfo GetAgent(UUID sessionID);
+        PresenceInfo[] GetAgents(UUID[] PrincipalIDs);
     }
 }
diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs
index 2157462..56ec504 100644
--- a/OpenSim/Services/PresenceService/PresenceService.cs
+++ b/OpenSim/Services/PresenceService/PresenceService.cs
@@ -50,18 +50,104 @@ namespace OpenSim.Services.PresenceService
         {
         }
 
-        public bool Report(PresenceInfo presence)
+        public bool LoginAgent(UUID principalID, UUID sessionID,
+                UUID secureSessionID)
         {
-            PresenceData p = new PresenceData();
-            p.Data = new Dictionary<string, string>();
+            // We have just logged in. If there is any info in the table
+            // it's OK to overwrite. So we won't bother reading it first
+            //
+            PresenceData data = new PresenceData();
 
-            p.UUID = presence.PrincipalID;
-            p.currentRegion = presence.RegionID;
+            data.PrincipalID = principalID;
+            data.RegionID = UUID.Zero;
+            data.SessionID = sessionID;
+            data.Data["SecureSessionID"] = secureSessionID.ToString();
+            data.Data["Login"] = Util.UnixTimeSinceEpoch().ToString();
+            
+            m_Database.Store(data);
 
-            foreach (KeyValuePair<string, string> kvp in presence.Data)
-                p.Data[kvp.Key] = kvp.Value;
+            return true;
+        }
+
+        public bool LogoutAgent(UUID sessionID)
+        {
+            PresenceData data = m_Database.Get(sessionID);
+            if (data == null)
+                return false;
+
+            data.Data["Online"] = "false";
+            data.Data["Logout"] = Util.UnixTimeSinceEpoch().ToString();
+
+            m_Database.Store(data);
 
             return false;
         }
+
+        public bool LogoutRegionAgents(UUID regionID)
+        {
+            m_Database.LogoutRegionAgents(regionID);
+
+            return true;
+        }
+
+
+        public bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt)
+        {
+            return m_Database.ReportAgent(sessionID, regionID,
+                    position.ToString(), lookAt.ToString());
+        }
+
+        public PresenceInfo GetAgent(UUID sessionID)
+        {
+            PresenceInfo ret = new PresenceInfo();
+            
+            PresenceData data = m_Database.Get(sessionID);
+            if (data == null)
+                return null;
+
+            ret.PrincipalID = data.PrincipalID;
+            ret.RegionID = data.RegionID;
+            ret.SessionID = data.SessionID;
+            ret.SecureSessionID = new UUID(data.Data["SecureSessionID"]);
+            ret.Online = bool.Parse(data.Data["Online"]);
+            ret.Login = Util.ToDateTime(Convert.ToInt32(data.Data["Login"]));
+            ret.Logout = Util.ToDateTime(Convert.ToInt32(data.Data["Logout"]));
+            ret.Position = Vector3.Parse(data.Data["Position"]);
+            ret.LookAt = Vector3.Parse(data.Data["LookAt"]);
+
+            return ret;
+        }
+
+        public PresenceInfo[] GetAgents(UUID[] PrincipalIDs)
+        {
+            List<PresenceInfo> info = new List<PresenceInfo>();
+
+            foreach (UUID principalID in PrincipalIDs)
+            {
+                PresenceData[] data = m_Database.Get("PrincipalID",
+                        principalID.ToString());
+
+                foreach (PresenceData d in data)
+                {
+                    PresenceInfo ret = new PresenceInfo();
+
+                    ret.PrincipalID = d.PrincipalID;
+                    ret.RegionID = d.RegionID;
+                    ret.SessionID = d.SessionID;
+                    ret.SecureSessionID = new UUID(d.Data["SecureSessionID"]);
+                    ret.Online = bool.Parse(d.Data["Online"]);
+                    ret.Login = Util.ToDateTime(Convert.ToInt32(
+                            d.Data["Login"]));
+                    ret.Logout = Util.ToDateTime(Convert.ToInt32(
+                            d.Data["Logout"]));
+                    ret.Position = Vector3.Parse(d.Data["Position"]);
+                    ret.LookAt = Vector3.Parse(d.Data["LookAt"]);
+
+                    info.Add(ret);
+                }
+            }
+
+            return info.ToArray();
+        }
     }
 }