diff options
author | Melanie | 2011-06-11 12:08:02 +0100 |
---|---|---|
committer | Melanie | 2011-06-11 12:08:02 +0100 |
commit | a1c16a42002757f65d77b530571405bd740bf2f7 (patch) | |
tree | 6b86e3ddd09538f83c541a36d02f6668eeed8745 /OpenSim/Services/HypergridService | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | Added a Sleep in between each site call, to slow the xml-rpc requests down. (diff) | |
download | opensim-SC-a1c16a42002757f65d77b530571405bd740bf2f7.zip opensim-SC-a1c16a42002757f65d77b530571405bd740bf2f7.tar.gz opensim-SC-a1c16a42002757f65d77b530571405bd740bf2f7.tar.bz2 opensim-SC-a1c16a42002757f65d77b530571405bd740bf2f7.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/HypergridService')
-rw-r--r-- | OpenSim/Services/HypergridService/UserAgentService.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index 41d5a88..ac53583 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs | |||
@@ -197,9 +197,11 @@ namespace OpenSim.Services.HypergridService | |||
197 | agentCircuit.firstname, agentCircuit.lastname, region.ServerURI, reason); | 197 | agentCircuit.firstname, agentCircuit.lastname, region.ServerURI, reason); |
198 | 198 | ||
199 | // restore the old travel info | 199 | // restore the old travel info |
200 | if(reason != "Logins Disabled") | 200 | lock (m_TravelingAgents) |
201 | { | 201 | { |
202 | lock (m_TravelingAgents) | 202 | if (old == null) |
203 | m_TravelingAgents.Remove(agentCircuit.SessionID); | ||
204 | else | ||
203 | m_TravelingAgents[agentCircuit.SessionID] = old; | 205 | m_TravelingAgents[agentCircuit.SessionID] = old; |
204 | } | 206 | } |
205 | 207 | ||