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

bulletsim
BlueWall 2011-06-01 17:01:08 -04:00
commit 984b801dd9
1 changed files with 5 additions and 2 deletions

View File

@ -197,8 +197,11 @@ namespace OpenSim.Services.HypergridService
agentCircuit.firstname, agentCircuit.lastname, region.ServerURI, reason); agentCircuit.firstname, agentCircuit.lastname, region.ServerURI, reason);
// restore the old travel info // restore the old travel info
lock (m_TravelingAgents) if(reason != "Logins Disabled")
m_TravelingAgents[agentCircuit.SessionID] = old; {
lock (m_TravelingAgents)
m_TravelingAgents[agentCircuit.SessionID] = old;
}
return false; return false;
} }