From 4cf60c5d9d95b5d7566c24f79f321e39fc2e2679 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Wed, 8 Jun 2011 19:51:48 -0700 Subject: [PATCH] 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 :0 --- OpenSim/Services/HypergridService/UserAgentService.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index 7ed5ea5ed0..1559cf3205 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs @@ -197,9 +197,11 @@ namespace OpenSim.Services.HypergridService agentCircuit.firstname, agentCircuit.lastname, region.ServerURI, reason); // restore the old travel info - if(reason != "Logins Disabled") + lock (m_TravelingAgents) { - lock (m_TravelingAgents) + if (old == null) + m_TravelingAgents.Remove(agentCircuit.SessionID); + else m_TravelingAgents[agentCircuit.SessionID] = old; }