aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorBlueWall2011-06-01 18:47:06 -0400
committerBlueWall2011-06-01 18:47:06 -0400
commit777f57d9469d4df11ea2bf2bd0704f89cae34b0a (patch)
tree918dba006ce1dbcffa7600f1546414c1b201def3 /OpenSim
parentRevert "Use current TravelingAgent if the login failure reason is "Logins Dis... (diff)
downloadopensim-SC_OLD-777f57d9469d4df11ea2bf2bd0704f89cae34b0a.zip
opensim-SC_OLD-777f57d9469d4df11ea2bf2bd0704f89cae34b0a.tar.gz
opensim-SC_OLD-777f57d9469d4df11ea2bf2bd0704f89cae34b0a.tar.bz2
opensim-SC_OLD-777f57d9469d4df11ea2bf2bd0704f89cae34b0a.tar.xz
Re-Apply Use current TravelingAgent if the the login failure reason is "Logins Disabled" to fix NullReferenceException, allowing agent to login to fallback region when logins are disabled by "StartDisabled = true" or when logins are disabled by RegionReady""
This reverts commit 0a430bbffb561a5172220e7617257798c11a66f5.
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/HypergridService/UserAgentService.cs7
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 }