From d08df7bda71e1ad0b3001ac160ea5553fe7d7ad5 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 12 May 2017 15:22:16 +0100 Subject: [PATCH] mantis 8165: fix a null ref on hg gatekeeper on another place --- OpenSim/Services/HypergridService/GatekeeperService.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 3e6b43a577..8e3cf0e27c 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs @@ -376,7 +376,8 @@ namespace OpenSim.Services.HypergridService return false; } - if(aCircuit.AgentID == new UUID("6571e388-6218-4574-87db-f9379718315e")) + UUID agentID = aCircuit.AgentID; + if(agentID == new UUID("6571e388-6218-4574-87db-f9379718315e")) { // really? reason = "Invalid account ID"; @@ -385,14 +386,14 @@ namespace OpenSim.Services.HypergridService if(m_GridUserService != null) { - string PrincipalIDstr = account.PrincipalID.ToString(); + string PrincipalIDstr = agentID.ToString(); GridUserInfo guinfo = m_GridUserService.GetGridUserInfo(PrincipalIDstr); if(!m_allowDuplicatePresences) { if(guinfo != null && guinfo.Online && guinfo.LastRegionID != UUID.Zero) { - if(SendAgentGodKillToRegion(UUID.Zero, account.PrincipalID, guinfo)) + if(SendAgentGodKillToRegion(UUID.Zero, agentID, guinfo)) { m_log.InfoFormat( "[GATEKEEPER SERVICE]: Login failed for {0} {1}, reason: already logged in",