From 98b86c012e7906c942c17413a5a24b95bb244464 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 3 Sep 2019 02:22:08 +0100 Subject: [PATCH] avoid a null ref --- .../ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs index e09f55c3fc..d31c7adfee 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs @@ -298,9 +298,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid List grinfo = null; if (String.IsNullOrEmpty(regionName)) { - List grinfos = m_RemoteGridService.GetDefaultRegions(UUID.Zero); - if (grinfos == null) - m_log.Warn("[REMOTE GRID CONNECTOR] returned null default regions"); + List grinfos = m_RemoteGridService.GetDefaultRegions(scopeID); + if (grinfos == null || grinfos.Count == 0) + m_log.Warn("[REMOTE GRID CONNECTOR] returned no default regions"); else { m_log.WarnFormat("[REMOTE GRID CONNECTOR] returned default regions {0}, ...", grinfos[0].RegionName);