diff options
author | Diva Canto | 2011-06-08 19:51:48 -0700 |
---|---|---|
committer | Diva Canto | 2011-06-08 19:51:48 -0700 |
commit | 4cf60c5d9d95b5d7566c24f79f321e39fc2e2679 (patch) | |
tree | e27e28c3353b019651be6fac29eb125e4b8ea45d /OpenSim | |
parent | Consistency fix on the last commit. (diff) | |
download | opensim-SC_OLD-4cf60c5d9d95b5d7566c24f79f321e39fc2e2679.zip opensim-SC_OLD-4cf60c5d9d95b5d7566c24f79f321e39fc2e2679.tar.gz opensim-SC_OLD-4cf60c5d9d95b5d7566c24f79f321e39fc2e2679.tar.bz2 opensim-SC_OLD-4cf60c5d9d95b5d7566c24f79f321e39fc2e2679.tar.xz |
Removing special casing on failures. This may also fix reports of this issue:
22:07:53 - [USER AGENT CONNECTOR]: remote call to http://hg.osgrid.org:80/ returned an error: Requested method [locate_user] from 127.0.0.1 threw exception: Object reference not set to an instance of an object at OpenSim.Services.HypergridService.UserAgentService.LocateUser (UUID userID) [0x00000] in <filename unknown>:0
Diffstat (limited to 'OpenSim')
-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 7ed5ea5..1559cf3 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 | ||