aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorBlueWall2011-06-01 18:10:56 -0400
committerBlueWall2011-06-01 18:10:56 -0400
commit0a430bbffb561a5172220e7617257798c11a66f5 (patch)
tree4839c5ae5f3aa369570c0840662b91fd9972183c /OpenSim
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-0a430bbffb561a5172220e7617257798c11a66f5.zip
opensim-SC_OLD-0a430bbffb561a5172220e7617257798c11a66f5.tar.gz
opensim-SC_OLD-0a430bbffb561a5172220e7617257798c11a66f5.tar.bz2
opensim-SC_OLD-0a430bbffb561a5172220e7617257798c11a66f5.tar.xz
Revert "Use current TravelingAgent if 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 4b9e446c6267a1161263d885699e72c97e8a94eb.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Services/HypergridService/UserAgentService.cs7
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index 2f2ebfb..387547e 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -197,11 +197,8 @@ 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 m_TravelingAgents[agentCircuit.SessionID] = old;
202 lock (m_TravelingAgents)
203 m_TravelingAgents[agentCircuit.SessionID] = old;
204 }
205 202
206 return false; 203 return false;
207 } 204 }