diff options
author | Pixel Tomsen | 2011-10-13 01:09:10 +0200 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-10-19 01:19:21 +0100 |
commit | 178b8d0926a53d82f54d60c088f36c7bad13dc87 (patch) | |
tree | 7c816a5216eac3b36018d7d859a38c39c1d9fe62 /OpenSim/ApplicationPlugins/LoadRegions | |
parent | Make ScopeID optional for http GetAccount and GetAccounts (diff) | |
download | opensim-SC-178b8d0926a53d82f54d60c088f36c7bad13dc87.zip opensim-SC-178b8d0926a53d82f54d60c088f36c7bad13dc87.tar.gz opensim-SC-178b8d0926a53d82f54d60c088f36c7bad13dc87.tar.bz2 opensim-SC-178b8d0926a53d82f54d60c088f36c7bad13dc87.tar.xz |
Region-UUID - can not be zero-uuid
http://opensimulator.org/mantis/view.php?id=3426
Diffstat (limited to 'OpenSim/ApplicationPlugins/LoadRegions')
-rw-r--r-- | OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs index 6e28eba..1945ff2 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | |||
@@ -30,6 +30,7 @@ using System.Collections.Generic; | |||
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using System.Threading; | 31 | using System.Threading; |
32 | using log4net; | 32 | using log4net; |
33 | using OpenMetaverse; | ||
33 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
34 | using OpenSim.Framework.RegionLoader.Filesystem; | 35 | using OpenSim.Framework.RegionLoader.Filesystem; |
35 | using OpenSim.Framework.RegionLoader.Web; | 36 | using OpenSim.Framework.RegionLoader.Web; |
@@ -152,9 +153,20 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
152 | /// <returns>True if we're sane, false if we're insane</returns> | 153 | /// <returns>True if we're sane, false if we're insane</returns> |
153 | private bool CheckRegionsForSanity(RegionInfo[] regions) | 154 | private bool CheckRegionsForSanity(RegionInfo[] regions) |
154 | { | 155 | { |
155 | if (regions.Length <= 1) | 156 | if (regions.Length == 0) |
156 | return true; | 157 | return true; |
157 | 158 | ||
159 | foreach (RegionInfo region in regions) | ||
160 | { | ||
161 | if (region.RegionID == UUID.Zero) | ||
162 | { | ||
163 | m_log.ErrorFormat( | ||
164 | "[LOAD REGIONS PLUGIN]: Region {0} has invalidate zero UUID <{1}>", | ||
165 | region.RegionName, region.RegionID); | ||
166 | return false; | ||
167 | } | ||
168 | } | ||
169 | |||
158 | for (int i = 0; i < regions.Length - 1; i++) | 170 | for (int i = 0; i < regions.Length - 1; i++) |
159 | { | 171 | { |
160 | for (int j = i + 1; j < regions.Length; j++) | 172 | for (int j = i + 1; j < regions.Length; j++) |