1 files changed, 4 insertions, 2 deletions

diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index 7ed5ea5..1559cf3 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -197,9 +197,11 @@ namespace OpenSim.Services.HypergridService
                     agentCircuit.firstname, agentCircuit.lastname, region.ServerURI, reason);
 
                 // restore the old travel info
-                if(reason != "Logins Disabled")
+                lock (m_TravelingAgents)
                 {
-                    lock (m_TravelingAgents)
+                    if (old == null)
+                        m_TravelingAgents.Remove(agentCircuit.SessionID);
+                    else
                         m_TravelingAgents[agentCircuit.SessionID] = old;
                 }