Merge branch 'master' of /home/opensim/src/opensim

2011-06-01 17:01:08 -04:00 · 2011-06-01 17:01:08 -04:00 · 984b801dd9
parent 929bdba346 4b9e446c62
commit 984b801dd9
1 changed files with 5 additions and 2 deletions
--- 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;
            }