Adding new fields and home location methid to presence. Adding cleanup

(deleting all but one presence record) on logout so that they don't pile up.

3 files changed, 80 insertions, 4 deletions

diff --git a/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs b/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
index 4ad457f..482862d 100644
--- a/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
@@ -371,6 +371,52 @@ namespace OpenSim.Services.Connectors
         }
 
 
+        public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            //sendData["SCOPEID"] = scopeID.ToString();
+            sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
+            sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
+            sendData["METHOD"] = "sethome";
+
+            sendData["UserID"] = userID;
+            sendData["RegionID"] = regionID.ToString();
+            sendData["position"] = position.ToString();
+            sendData["lookAt"] = lookAt.ToString();
+
+            string reqString = ServerUtils.BuildQueryString(sendData);
+            // m_log.DebugFormat("[PRESENCE CONNECTOR]: queryString = {0}", reqString);
+            try
+            {
+                string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                        m_ServerURI + "/presence",
+                        reqString);
+                if (reply != string.Empty)
+                {
+                    Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+                    if (replyData.ContainsKey("Result"))
+                    {
+                        if (replyData["Result"].ToString().ToLower() == "success")
+                            return true;
+                        else
+                            return false;
+                    }
+                    else
+                        m_log.DebugFormat("[PRESENCE CONNECTOR]: SetHomeLocation reply data does not contain result field");
+
+                }
+                else
+                    m_log.DebugFormat("[PRESENCE CONNECTOR]: SetHomeLocation received empty reply");
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PRESENCE CONNECTOR]: Exception when contacting presence server: {0}", e.Message);
+            }
+
+            return false;
+        }
+
         #endregion
 
     }
diff --git a/OpenSim/Services/Interfaces/IPresenceService.cs b/OpenSim/Services/Interfaces/IPresenceService.cs
index de3813a..2582648 100644
--- a/OpenSim/Services/Interfaces/IPresenceService.cs
+++ b/OpenSim/Services/Interfaces/IPresenceService.cs
@@ -41,6 +41,9 @@ namespace OpenSim.Services.Interfaces
         public DateTime Logout;
         public Vector3 Position;
         public Vector3 LookAt;
+        public UUID HomeRegionID;
+        public Vector3 HomePosition;
+        public Vector3 HomeLookAt;
 
         public PresenceInfo()
         {
@@ -87,6 +90,7 @@ namespace OpenSim.Services.Interfaces
         bool LogoutRegionAgents(UUID regionID);
 
         bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt);
+        bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt);
 
         PresenceInfo GetAgent(UUID sessionID);
         PresenceInfo[] GetAgents(string[] userIDs);
diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs
index adbf430..b3d8194 100644
--- a/OpenSim/Services/PresenceService/PresenceService.cs
+++ b/OpenSim/Services/PresenceService/PresenceService.cs
@@ -54,9 +54,10 @@ namespace OpenSim.Services.PresenceService
         public bool LoginAgent(string userID, UUID sessionID,
                 UUID secureSessionID)
         {
-            // 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
-            //
+            m_Database.Prune(userID);
+
+            PresenceData[] d = m_Database.Get("UserID", userID);
+
             PresenceData data = new PresenceData();
 
             data.UserID = userID;
@@ -64,6 +65,12 @@ namespace OpenSim.Services.PresenceService
             data.SessionID = sessionID;
             data.Data["SecureSessionID"] = secureSessionID.ToString();
             data.Data["Login"] = Util.UnixTimeSinceEpoch().ToString();
+            if (d.Length > 0)
+            {
+                data.Data["HomeRegionID"] = d[0].Data["HomeRegionID"];
+                data.Data["HomePosition"] = d[0].Data["HomePosition"];
+                data.Data["HomeLookAt"] = d[0].Data["HomeLookAt"];
+            }
             
             m_Database.Store(data);
 
@@ -76,12 +83,20 @@ namespace OpenSim.Services.PresenceService
             if (data == null)
                 return false;
 
+            PresenceData[] d = m_Database.Get("UserID", data.UserID);
+
+            if (d.Length > 1)
+            {
+                m_Database.Delete("SessionID", sessionID.ToString());
+                return true;
+            }
+
             data.Data["Online"] = "false";
             data.Data["Logout"] = Util.UnixTimeSinceEpoch().ToString();
 
             m_Database.Store(data);
 
-            return false;
+            return true;
         }
 
         public bool LogoutRegionAgents(UUID regionID)
@@ -114,6 +129,9 @@ namespace OpenSim.Services.PresenceService
             ret.Logout = Util.ToDateTime(Convert.ToInt32(data.Data["Logout"]));
             ret.Position = Vector3.Parse(data.Data["Position"]);
             ret.LookAt = Vector3.Parse(data.Data["LookAt"]);
+            ret.HomeRegionID = new UUID(data.Data["HomeRegionID"]);
+            ret.HomePosition = Vector3.Parse(data.Data["HomePosition"]);
+            ret.HomeLookAt = Vector3.Parse(data.Data["HomeLookAt"]);
 
             return ret;
         }
@@ -140,6 +158,9 @@ namespace OpenSim.Services.PresenceService
                             d.Data["Logout"]));
                     ret.Position = Vector3.Parse(d.Data["Position"]);
                     ret.LookAt = Vector3.Parse(d.Data["LookAt"]);
+                    ret.HomeRegionID = new UUID(d.Data["HomeRegionID"]);
+                    ret.HomePosition = Vector3.Parse(d.Data["HomePosition"]);
+                    ret.HomeLookAt = Vector3.Parse(d.Data["HomeLookAt"]);
 
                     info.Add(ret);
                 }
@@ -147,5 +168,10 @@ namespace OpenSim.Services.PresenceService
 
             return info.ToArray();
         }
+
+        public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
+        {
+            return m_Database.SetHomeLocation(userID, regionID, position, lookAt);
+        }
     }
 }