5 files changed, 20 insertions, 2 deletions

diff --git a/OpenSim/Data/IHGTravelingData.cs b/OpenSim/Data/IHGTravelingData.cs
index dd89935..452af7b 100644
--- a/OpenSim/Data/IHGTravelingData.cs
+++ b/OpenSim/Data/IHGTravelingData.cs
@@ -54,5 +54,6 @@ namespace OpenSim.Data
         HGTravelingData[] GetSessions(UUID userID);
         bool Store(HGTravelingData data);
         bool Delete(UUID sessionID);
+        void DeleteOld();
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/MySQLHGTravelData.cs b/OpenSim/Data/MySQL/MySQLHGTravelData.cs
index 1efbfc3..e81b880 100644
--- a/OpenSim/Data/MySQL/MySQLHGTravelData.cs
+++ b/OpenSim/Data/MySQL/MySQLHGTravelData.cs
@@ -66,5 +66,15 @@ namespace OpenSim.Data.MySQL
             return Delete("SessionID", sessionID.ToString());
         }
 
+        public void DeleteOld()
+        {
+            using (MySqlCommand cmd = new MySqlCommand())
+            {
+                cmd.CommandText = String.Format("delete from {0} where TMStamp < NOW() - INTERVAL 2 DAY", m_Realm);
+
+                ExecuteNonQuery(cmd);
+            }
+
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations b/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations
index a0c9ebe..b4e4422 100644
--- a/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations
@@ -9,6 +9,7 @@ CREATE TABLE `hg_traveling_data` (
         `ServiceToken` VARCHAR(255) NOT NULL DEFAULT '',
         `ClientIPAddress` VARCHAR(16) NOT NULL DEFAULT '',
         `MyIPAddress` VARCHAR(16) NOT NULL DEFAULT '',
+    `TMStamp` timestamp NOT NULL,
     PRIMARY KEY  (`SessionID`),
         KEY (`UserID`)
 ) ENGINE=InnoDB;
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index 759155a..76dbc72 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -207,6 +207,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             {
                 m_GatekeeperConnector = new GatekeeperServiceConnector(scene.AssetService);
                 m_UAS = scene.RequestModuleInterface<IUserAgentService>();
+                if (m_UAS == null)
+                    m_UAS = new UserAgentServiceConnector(m_ThisHomeURI);
+
             }
         }
 
@@ -573,12 +576,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             if (uMan != null && uMan.IsLocalGridUser(obj.AgentId))
             {
                 // local grid user
+                m_UAS.LogoutAgent(obj.AgentId, obj.SessionId);
                 return;
             }
 
             AgentCircuitData aCircuit = ((Scene)(obj.Scene)).AuthenticateHandler.GetAgentCircuitData(obj.CircuitCode);
-
-            if (aCircuit.ServiceURLs.ContainsKey("HomeURI"))
+            if (aCircuit != null && aCircuit.ServiceURLs != null && aCircuit.ServiceURLs.ContainsKey("HomeURI"))
             {
                 string url = aCircuit.ServiceURLs["HomeURI"].ToString();
                 IUserAgentService security = new UserAgentServiceConnector(url);
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index b597cb9..b414aca 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -148,6 +148,9 @@ namespace OpenSim.Services.HypergridService
                 if (!m_GridName.EndsWith("/"))
                     m_GridName = m_GridName + "/";
 
+                // Finally some cleanup
+                m_Database.DeleteOld();
+
             }
         }