From 9b7c99f0cfd8fbcd3ce31e0be6fa68f5bedef78b Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Wed, 29 Sep 2010 14:24:32 -0700
Subject: 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

---
 .../Connectors/SimianGrid/SimianPresenceServiceConnector.cs         | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs')

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);
-- 
cgit v1.1


From b6e0563ad7ad7f6fc396229823d7e76cd31dced7 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Wed, 29 Sep 2010 14:34:02 -0700
Subject: Part two of the previous commit, making IGridUserService.LoggedOut()
 more flexible without changing current behavior

---
 .../Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs')

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
index fa51c9a..a41c6ad 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
@@ -260,7 +260,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             return null;
         }
 
-        public bool LoggedOut(string userID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
+        public bool LoggedOut(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
         {
             // Save our last position as user data
             NameValueCollection requestArgs = new NameValueCollection
-- 
cgit v1.1


From 08ee7a0e51a86e0a65c821e28eceaedaae9f009d Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Wed, 29 Sep 2010 15:14:13 -0700
Subject: Actually log users out (call LogoutAgent) in the
 SimianPresenceServiceConnector when LoggedOut() is called

---
 .../Connectors/SimianGrid/SimianPresenceServiceConnector.cs         | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs')

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
index a41c6ad..8141420 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
@@ -262,6 +262,12 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public bool LoggedOut(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
         {
+            m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Logging out user " + userID);
+
+            // Remove the session to mark this user offline
+            if (!LogoutAgent(sessionID))
+                return false;
+
             // Save our last position as user data
             NameValueCollection requestArgs = new NameValueCollection
             {
-- 
cgit v1.1