Merge commit 'a6c5e00c45b3d64b4e912a65c8ed7f31eb643759' into bigmerge

1 files changed, 2 insertions, 0 deletions

diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 0a4372a..0aeae67 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -107,6 +107,8 @@ namespace OpenSim.Services.GridService
         public string RegisterRegion(UUID scopeID, GridRegion regionInfos)
         {
             IConfig gridConfig = m_config.Configs["GridService"];
+            // First Check for invalidate NULL-UUID, if true fast quit 
+            if (regionInfos.RegionID == UUID.Zero) return "Invalidate RegionID - can not be UUID-NULL";            
             // This needs better sanity testing. What if regionInfo is registering in
             // overlapping coords?
             RegionData region = m_Database.Get(regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID);