From a4e7ab6fcfed3e40bf322010550671e480a363c9 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 3 Aug 2017 18:09:26 +0100 Subject: [PATCH] avoid a null ref --- 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 8e3cf0e27c..5c6abd217f 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs @@ -395,9 +395,10 @@ namespace OpenSim.Services.HypergridService { if(SendAgentGodKillToRegion(UUID.Zero, agentID, guinfo)) { - m_log.InfoFormat( - "[GATEKEEPER SERVICE]: Login failed for {0} {1}, reason: already logged in", - account.FirstName, account.LastName); + if(account != null) + m_log.InfoFormat( + "[GATEKEEPER SERVICE]: Login failed for {0} {1}, reason: already logged in", + account.FirstName, account.LastName); reason = "You appear to be already logged in on the destination grid " + "Please wait a a minute or two and retry. " + "If this takes longer than a few minutes please contact the grid owner.";