diff options
| author | BlueWall | 2011-06-01 17:01:08 -0400 |
|---|---|---|
| committer | BlueWall | 2011-06-01 17:01:08 -0400 |
| commit | 984b801dd9cedf9034f299706038cfebeba5cc65 (patch) | |
| tree | db51c0c99e168a5f90fb5a671ef2da5df86b37f4 /OpenSim | |
| parent | Merge branch 'master' of /home/opensim/src/opensim (diff) | |
| parent | Use current TravelingAgent if the login failure reason is "Logins Disabled" t... (diff) | |
| download | opensim-SC_OLD-984b801dd9cedf9034f299706038cfebeba5cc65.zip opensim-SC_OLD-984b801dd9cedf9034f299706038cfebeba5cc65.tar.gz opensim-SC_OLD-984b801dd9cedf9034f299706038cfebeba5cc65.tar.bz2 opensim-SC_OLD-984b801dd9cedf9034f299706038cfebeba5cc65.tar.xz | |
Merge branch 'master' of /home/opensim/src/opensim
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Services/HypergridService/UserAgentService.cs | 7 |
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 | |||
| 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 | lock (m_TravelingAgents) | 200 | if(reason != "Logins Disabled") |
| 201 | m_TravelingAgents[agentCircuit.SessionID] = old; | 201 | { |
| 202 | lock (m_TravelingAgents) | ||
| 203 | m_TravelingAgents[agentCircuit.SessionID] = old; | ||
| 204 | } | ||
| 202 | 205 | ||
| 203 | return false; | 206 | return false; |
| 204 | } | 207 | } |