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 0a430bbffb.
2011-06-01 18:47:06 -04:00 · 2011-06-01 18:47:06 -04:00 · 777f57d946
parent 0a430bbffb
commit 777f57d946
1 changed files with 5 additions and 2 deletions
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@ -197,8 +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)
                        m_TravelingAgents[agentCircuit.SessionID] = old;
+                }

                return false;
            }