Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

1 files changed, 5 insertions, 2 deletions

diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index 387547e..2f2ebfb 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -197,8 +197,11 @@ namespace OpenSim.Services.HypergridService
                     agentCircuit.firstname, agentCircuit.lastname, region.ServerURI, reason);
 
                 // restore the old travel info
-                lock (m_TravelingAgents)
-                    m_TravelingAgents[agentCircuit.SessionID] = old;
+                if(reason != "Logins Disabled")
+                {
+                    lock (m_TravelingAgents)
+                        m_TravelingAgents[agentCircuit.SessionID] = old;
+                }
 
                 return false;
             }