3 files changed, 57 insertions, 0 deletions

diff --git a/OpenSim/Data/IPresenceData.cs b/OpenSim/Data/IPresenceData.cs
index 98353ed..20eb7f6 100644
--- a/OpenSim/Data/IPresenceData.cs
+++ b/OpenSim/Data/IPresenceData.cs
@@ -51,6 +51,9 @@ namespace OpenSim.Data
         PresenceData Get(UUID sessionID);
         void LogoutRegionAgents(UUID regionID);
         bool ReportAgent(UUID sessionID, UUID regionID, string position, string lookAt);
+        bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt);
         PresenceData[] Get(string field, string data);
+        void Prune(string userID);
+        bool Delete(string field, string val);
     }
 }
diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
index b2bd5f6..873d6d4 100644
--- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
+++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
@@ -177,6 +177,8 @@ namespace OpenSim.Data.MySQL
                 result.Add(row);
             }
 
+            reader.Close();
+
             CloseReaderCommand(cmd);
 
             return result.ToArray();
diff --git a/OpenSim/Data/MySQL/MySQLPresenceData.cs b/OpenSim/Data/MySQL/MySQLPresenceData.cs
index 8ccad90..72b8a0c 100644
--- a/OpenSim/Data/MySQL/MySQLPresenceData.cs
+++ b/OpenSim/Data/MySQL/MySQLPresenceData.cs
@@ -93,5 +93,57 @@ namespace OpenSim.Data.MySQL
 
             return true;
         }
+
+        public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
+        {
+            PresenceData[] pd = Get("UserID", userID);
+            if (pd.Length == 0)
+                return false;
+
+            MySqlCommand cmd = new MySqlCommand();
+
+            cmd.CommandText = String.Format("update {0} set HomeRegionID=?HomeRegionID, HomePosition=?HomePosition, HomeLookAt=?HomeLookAt where UserID=?UserID", m_Realm);
+
+            cmd.Parameters.AddWithValue("?UserID", userID);
+            cmd.Parameters.AddWithValue("?HomeRegionID", regionID.ToString());
+            cmd.Parameters.AddWithValue("?HomePosition", position);
+            cmd.Parameters.AddWithValue("?HomeLookAt", lookAt);
+
+            if (ExecuteNonQuery(cmd) == 0)
+                return false;
+
+            return true;
+        }
+
+        public void Prune(string userID)
+        {
+            MySqlCommand cmd = new MySqlCommand();
+
+            cmd.CommandText = String.Format("select * from {0} where UserID=?UserID", m_Realm);
+
+            cmd.Parameters.AddWithValue("?UserID", userID);
+
+            IDataReader reader = ExecuteReader(cmd);
+
+            List<UUID> deleteSessions = new List<UUID>();
+            int online = 0;
+
+            while(reader.Read())
+            {
+                if (bool.Parse(reader["Online"].ToString()))
+                    online++;
+                else
+                    deleteSessions.Add(new UUID(reader["SessionID"].ToString()));
+            }
+
+            if (online == 0 && deleteSessions.Count > 0)
+                deleteSessions.RemoveAt(0);
+
+            reader.Close();
+            CloseReaderCommand(cmd);
+
+            foreach (UUID s in deleteSessions)
+                Delete("SessionID", s.ToString());
+        }
     }
 }