GridUserService in place. Replaces the contrived concept of storing user's home and position info in the presence service. WARNING: I violated a taboo by deleting 2 migration files and simplifying the original table creation for Presence. This should not cause any problems to anyone, though. Things will work with the new simplified table, as well as with the previous contrived one. If there are any problems, solving them is as easy as dropping the presence table and deleting its row in the migrations table. The presence info only exists during a user's session anyway.

BTW, the Meshing files want to be committed too -- EOFs.

2 files changed, 94 insertions, 11 deletions

diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs
index c6e33bb..697ba63 100644
--- a/OpenSim/Services/UserAccountService/GridUserService.cs
+++ b/OpenSim/Services/UserAccountService/GridUserService.cs
@@ -31,6 +31,7 @@ using System.Reflection;
 using Nini.Config;
 using OpenSim.Data;
 using OpenSim.Services.Interfaces;
+using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
@@ -50,27 +51,109 @@ namespace OpenSim.Services.UserAccountService
 
         public GridUserInfo GetGridUserInfo(string userID)
         {
-            GridUserData d = m_Database.GetGridUserData(userID);
-            
+            GridUserData d = m_Database.Get(userID);
+
+            if (d == null)
+                return null;
+
             GridUserInfo info = new GridUserInfo();
             info.UserID = d.UserID;
             info.HomeRegionID = new UUID(d.Data["HomeRegionID"]);
             info.HomePosition = Vector3.Parse(d.Data["HomePosition"]);
             info.HomeLookAt = Vector3.Parse(d.Data["HomeLookAt"]);
 
+            info.LastRegionID = new UUID(d.Data["LastRegionID"]);
+            info.LastPosition = Vector3.Parse(d.Data["LastPosition"]);
+            info.LastLookAt = Vector3.Parse(d.Data["LastLookAt"]);
+
+            info.Online = bool.Parse(d.Data["Online"]);
+            info.Login = Util.ToDateTime(Convert.ToInt32(d.Data["Login"]));
+            info.Logout = Util.ToDateTime(Convert.ToInt32(d.Data["Logout"]));
+
             return info;
         }
-        
-        public bool StoreGridUserInfo(GridUserInfo info)
+
+        public GridUserInfo LoggedIn(string userID)
+        {
+            m_log.DebugFormat("[GRID USER SERVICE]: User {0} is online", userID);
+            GridUserData d = m_Database.Get(userID);
+
+            if (d == null)
+            {
+                d = new GridUserData();
+                d.UserID = userID;
+            }
+
+            d.Data["Online"] = true.ToString();
+            d.Data["Login"] = Util.UnixTimeSinceEpoch().ToString();
+
+            m_Database.Store(d);
+
+            return GetGridUserInfo(userID);
+        }
+
+        public bool LoggedOut(string userID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
+        {
+            m_log.DebugFormat("[GRID USER SERVICE]: User {0} is offline", userID);
+            GridUserData d = m_Database.Get(userID);
+
+            if (d == null)
+            {
+                d = new GridUserData();
+                d.UserID = userID;
+            }
+
+            d.Data["Online"] = false.ToString();
+            d.Data["Logout"] = Util.UnixTimeSinceEpoch().ToString();
+            d.Data["LastRegionID"] = regionID.ToString();
+            d.Data["LastPosition"] = lastPosition.ToString();
+            d.Data["LastLookAt"] = lastLookAt.ToString();
+
+            return m_Database.Store(d);
+        }
+
+        protected bool StoreGridUserInfo(GridUserInfo info)
         {
             GridUserData d = new GridUserData();
 
-            d.Data["UserID"] = info.UserID;
             d.Data["HomeRegionID"] = info.HomeRegionID.ToString();
             d.Data["HomePosition"] = info.HomePosition.ToString();
             d.Data["HomeLookAt"] = info.HomeLookAt.ToString();
 
-            return m_Database.StoreGridUserData(d);
+            return m_Database.Store(d);
+        }
+
+        public bool SetHome(string userID, UUID homeID, Vector3 homePosition, Vector3 homeLookAt)
+        {
+            GridUserData d = m_Database.Get(userID);
+            if (d == null)
+            {
+                d = new GridUserData();
+                d.UserID = userID;
+            }
+
+            d.Data["HomeRegionID"] = homeID.ToString();
+            d.Data["HomePosition"] = homePosition.ToString();
+            d.Data["HomeLookAt"] = homeLookAt.ToString();
+
+            return m_Database.Store(d);
+        }
+
+        public bool SetLastPosition(string userID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
+        {
+            //m_log.DebugFormat("[Grid User Service]: SetLastPosition for {0}", userID);
+            GridUserData d = m_Database.Get(userID);
+            if (d == null)
+            {
+                d = new GridUserData();
+                d.UserID = userID;
+            }
+
+            d.Data["LastRegionID"] = regionID.ToString();
+            d.Data["LastPosition"] = lastPosition.ToString();
+            d.Data["LastLookAt"] = lastLookAt.ToString();
+
+            return m_Database.Store(d);
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index 35e2826..6923293 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Services.UserAccountService
 
         protected IGridService m_GridService;
         protected IAuthenticationService m_AuthenticationService;
-        protected IPresenceService m_PresenceService;
+        protected IGridUserService m_GridUserService;
         protected IInventoryService m_InventoryService;
 
         public UserAccountService(IConfigSource config)
@@ -69,9 +69,9 @@ namespace OpenSim.Services.UserAccountService
                 if (authServiceDll != string.Empty)
                     m_AuthenticationService = LoadPlugin<IAuthenticationService>(authServiceDll, new Object[] { config });
 
-                string presenceServiceDll = userConfig.GetString("PresenceService", string.Empty);
+                string presenceServiceDll = userConfig.GetString("GridUserService", string.Empty);
                 if (presenceServiceDll != string.Empty)
-                    m_PresenceService = LoadPlugin<IPresenceService>(presenceServiceDll, new Object[] { config });
+                    m_GridUserService = LoadPlugin<IGridUserService>(presenceServiceDll, new Object[] { config });
 
                 string invServiceDll = userConfig.GetString("InventoryService", string.Empty);
                 if (invServiceDll != string.Empty)
@@ -333,8 +333,8 @@ namespace OpenSim.Services.UserAccountService
                         if (defaultRegions != null && defaultRegions.Count >= 1)
                             home = defaultRegions[0];
 
-                        if (m_PresenceService != null && home != null)
-                            m_PresenceService.SetHomeLocation(account.PrincipalID.ToString(), home.RegionID, new Vector3(128, 128, 0), new Vector3(0, 1, 0));
+                        if (m_GridUserService != null && home != null)
+                            m_GridUserService.SetHome(account.PrincipalID.ToString(), home.RegionID, new Vector3(128, 128, 0), new Vector3(0, 1, 0));
                         else
                             m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to set home for account {0} {1}.",
                                firstName, lastName);