From 4b9e446c6267a1161263d885699e72c97e8a94eb Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Wed, 1 Jun 2011 16:57:01 -0400
Subject: 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

---
 OpenSim/Services/HypergridService/UserAgentService.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Services/HypergridService/UserAgentService.cs')

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
                     agentCircuit.firstname, agentCircuit.lastname, region.ServerURI, reason);
 
                 // restore the old travel info
-                lock (m_TravelingAgents)
-                    m_TravelingAgents[agentCircuit.SessionID] = old;
+                if(reason != "Logins Disabled")
+                {
+                    lock (m_TravelingAgents)
+                        m_TravelingAgents[agentCircuit.SessionID] = old;
+                }
 
                 return false;
             }
-- 
cgit v1.1


From 0a430bbffb561a5172220e7617257798c11a66f5 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Wed, 1 Jun 2011 18:10:56 -0400
Subject: 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.
---
 OpenSim/Services/HypergridService/UserAgentService.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Services/HypergridService/UserAgentService.cs')

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
                     agentCircuit.firstname, agentCircuit.lastname, region.ServerURI, reason);
 
                 // restore the old travel info
-                if(reason != "Logins Disabled")
-                {
-                    lock (m_TravelingAgents)
-                        m_TravelingAgents[agentCircuit.SessionID] = old;
-                }
+                lock (m_TravelingAgents)
+                    m_TravelingAgents[agentCircuit.SessionID] = old;
 
                 return false;
             }
-- 
cgit v1.1


From 777f57d9469d4df11ea2bf2bd0704f89cae34b0a Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Wed, 1 Jun 2011 18:47:06 -0400
Subject: 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.
---
 OpenSim/Services/HypergridService/UserAgentService.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Services/HypergridService/UserAgentService.cs')

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
                     agentCircuit.firstname, agentCircuit.lastname, region.ServerURI, reason);
 
                 // restore the old travel info
-                lock (m_TravelingAgents)
-                    m_TravelingAgents[agentCircuit.SessionID] = old;
+                if(reason != "Logins Disabled")
+                {
+                    lock (m_TravelingAgents)
+                        m_TravelingAgents[agentCircuit.SessionID] = old;
+                }
 
                 return false;
             }
-- 
cgit v1.1