From 156385f48b2b2829f2d427c72f269406c46019fa Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 8 Oct 2011 02:15:04 +0100
Subject: Tweak to language of last commit in rejecting UUID.Zero in
 GridService.RegisterRegion()

Allowing regions with UUID.Zero causes problems elsewhere according to http://opensimulator.org/mantis/view.php?id=3426
It's probably a bad idea to allow these in any case.
---
 OpenSim/Services/GridService/GridService.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Services/GridService')

diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 0aeae67..05cfe5f 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -107,8 +107,10 @@ 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";            
+
+            if (regionInfos.RegionID == UUID.Zero)
+                return "Invalid RegionID - cannot be zero UUID";
+
             // This needs better sanity testing. What if regionInfo is registering in
             // overlapping coords?
             RegionData region = m_Database.Get(regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID);
-- 
cgit v1.1