From 78e9dc7c2c71a2d1cfda7b39dfbc12ddbb64233b Mon Sep 17 00:00:00 2001 From: Melanie Date: Sun, 10 Jan 2010 04:23:23 +0000 Subject: [PATCH] Add a "LockedOut" flag to allow locking a region out via the grid server. This flag prevents registration of a known region --- OpenSim/Data/IRegionData.cs | 3 ++- OpenSim/Services/GridService/GridService.cs | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenSim/Data/IRegionData.cs b/OpenSim/Data/IRegionData.cs index 41c74f251a..140bc961af 100644 --- a/OpenSim/Data/IRegionData.cs +++ b/OpenSim/Data/IRegionData.cs @@ -71,6 +71,7 @@ namespace OpenSim.Data FallbackRegion = 2, // Regions we redirect to when the destination is down RegionOnline = 4, // Set when a region comes online, unset when it unregisters and DeleteOnUnregister is false NoDirectLogin = 8, // Region unavailable for direct logins (by name) - Persistent = 16 // Don't remove on unregister + Persistent = 16, // Don't remove on unregister + LockedOut = 32 // Don't allow registration } } diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index 66bbff037d..c48b10cc8a 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs @@ -119,6 +119,9 @@ namespace OpenSim.Services.GridService if (region != null) { + if ((Convert.ToInt32(region.Data["flags"]) & (int)OpenSim.Data.RegionFlags.LockedOut) != 0) + return false; + rdata.Data["flags"] = region.Data["flags"]; // Preserve fields } else