diff options
| author | UbitUmarov | 2019-09-03 02:22:08 +0100 |
|---|---|---|
| committer | UbitUmarov | 2019-09-03 02:22:08 +0100 |
| commit | 98b86c012e7906c942c17413a5a24b95bb244464 (patch) | |
| tree | 696b0199edbadc285f1b3f448cb0d7b74735022f | |
| parent | add a little more debug for now (diff) | |
| download | opensim-SC-98b86c012e7906c942c17413a5a24b95bb244464.zip opensim-SC-98b86c012e7906c942c17413a5a24b95bb244464.tar.gz opensim-SC-98b86c012e7906c942c17413a5a24b95bb244464.tar.bz2 opensim-SC-98b86c012e7906c942c17413a5a24b95bb244464.tar.xz | |
avoid a null ref
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs index e09f55c..d31c7ad 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 | |||
| 298 | List<GridRegion> grinfo = null; | 298 | List<GridRegion> grinfo = null; |
| 299 | if (String.IsNullOrEmpty(regionName)) | 299 | if (String.IsNullOrEmpty(regionName)) |
| 300 | { | 300 | { |
| 301 | List<GridRegion> grinfos = m_RemoteGridService.GetDefaultRegions(UUID.Zero); | 301 | List<GridRegion> grinfos = m_RemoteGridService.GetDefaultRegions(scopeID); |
| 302 | if (grinfos == null) | 302 | if (grinfos == null || grinfos.Count == 0) |
| 303 | m_log.Warn("[REMOTE GRID CONNECTOR] returned null default regions"); | 303 | m_log.Warn("[REMOTE GRID CONNECTOR] returned no default regions"); |
| 304 | else | 304 | else |
| 305 | { | 305 | { |
| 306 | m_log.WarnFormat("[REMOTE GRID CONNECTOR] returned default regions {0}, ...", grinfos[0].RegionName); | 306 | m_log.WarnFormat("[REMOTE GRID CONNECTOR] returned default regions {0}, ...", grinfos[0].RegionName); |