Made IGridUserService.SetLastPosition() more flexible to allow different possible implementations. This doesn't change any behavior or any Robust code, but it simplifies the SimianGrid connector by using the standard OpenSim interface for setting last position now

5 files changed, 18 insertions, 14 deletions

diff --git a/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs b/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs
index 935ebb1..48d2939 100644
--- a/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs
+++ b/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs
@@ -123,7 +123,7 @@ namespace OpenSim.Services.Connectors
             return Set(sendData, userID, regionID, position, lookAt);
         }
 
-        public bool SetLastPosition(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
+        public bool SetLastPosition(string userID, UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt)
         {
             Dictionary<string, object> sendData = new Dictionary<string, object>();
             //sendData["SCOPEID"] = scopeID.ToString();
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs
index 67a06f3..c89c81a 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs
@@ -29,6 +29,7 @@ using System;
 using System.Reflection;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
 using OpenMetaverse;
 using log4net;
 
@@ -38,12 +39,12 @@ namespace OpenSim.Services.Connectors.SimianGrid
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private SimianPresenceServiceConnector m_GridUserService;
+        private IGridUserService m_GridUserService;
         private Scene m_aScene;
 
-        public SimianActivityDetector(SimianPresenceServiceConnector guservice)
+        public SimianActivityDetector(IGridUserService guService)
         {
-            m_GridUserService = guservice;
+            m_GridUserService = guService;
             m_log.DebugFormat("[SIMIAN ACTIVITY DETECTOR]: Started");
         }
 
@@ -103,7 +104,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 m_log.DebugFormat("[SIMIAN ACTIVITY DETECTOR]: Detected client logout {0} in {1}", client.AgentId, client.Scene.RegionInfo.RegionName);
                 m_GridUserService.LoggedOut(client.AgentId.ToString(), client.Scene.RegionInfo.RegionID, position, lookat);
             }
-
         }
 
         void OnEnteringNewParcel(ScenePresence sp, int localLandID, UUID regionID)
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
index a344594..fa51c9a 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
@@ -304,12 +304,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
             return UpdateSession(sessionID, regionID, lastPosition, lastLookAt);
         }
 
-        public bool SetLastPosition(string userID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
-        {
-            // Never called
-            return false;
-        }
-
         public GridUserInfo GetGridUserInfo(string user)
         {
             m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent " + user);
diff --git a/OpenSim/Services/Interfaces/IGridUserService.cs b/OpenSim/Services/Interfaces/IGridUserService.cs
index 95ce5e8..dfb79a4 100644
--- a/OpenSim/Services/Interfaces/IGridUserService.cs
+++ b/OpenSim/Services/Interfaces/IGridUserService.cs
@@ -108,8 +108,18 @@ namespace OpenSim.Services.Interfaces
         bool LoggedOut(string userID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt);
         
         bool SetHome(string userID, UUID homeID, Vector3 homePosition, Vector3 homeLookAt);
-        bool SetLastPosition(string userID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt);
-    
+
+        /// <summary>
+        /// Stores the last known user position at the grid level
+        /// </summary>
+        /// <param name="userID">Ignore if your connector does not use userID for position updates</param>
+        /// <param name="sessionID">Ignore if your connector does not use sessionID for position updates</param>
+        /// <param name="regionID">RegionID where the user is currently located</param>
+        /// <param name="lastPosition">Region-relative position</param>
+        /// <param name="lastLookAt">Normalized look direction</param>
+        /// <returns>True if the user's last position was successfully updated, otherwise false</returns>
+        bool SetLastPosition(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt);
+        
         GridUserInfo GetGridUserInfo(string userID);
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs
index 697ba63..00a1ae2 100644
--- a/OpenSim/Services/UserAccountService/GridUserService.cs
+++ b/OpenSim/Services/UserAccountService/GridUserService.cs
@@ -139,7 +139,7 @@ namespace OpenSim.Services.UserAccountService
             return m_Database.Store(d);
         }
 
-        public bool SetLastPosition(string userID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
+        public bool SetLastPosition(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
         {
             //m_log.DebugFormat("[Grid User Service]: SetLastPosition for {0}", userID);
             GridUserData d = m_Database.Get(userID);