diff options
author | Melanie | 2010-01-10 04:23:23 +0000 |
---|---|---|
committer | Melanie | 2010-01-10 04:23:23 +0000 |
commit | 78e9dc7c2c71a2d1cfda7b39dfbc12ddbb64233b (patch) | |
tree | 3476e277e98d3b5e652f0a36718a6b3b44790f7e /OpenSim | |
parent | Add "Persistent" flag to regions table flags values (diff) | |
download | opensim-SC-78e9dc7c2c71a2d1cfda7b39dfbc12ddbb64233b.zip opensim-SC-78e9dc7c2c71a2d1cfda7b39dfbc12ddbb64233b.tar.gz opensim-SC-78e9dc7c2c71a2d1cfda7b39dfbc12ddbb64233b.tar.bz2 opensim-SC-78e9dc7c2c71a2d1cfda7b39dfbc12ddbb64233b.tar.xz |
Add a "LockedOut" flag to allow locking a region out via the grid server.
This flag prevents registration of a known region
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Data/IRegionData.cs | 3 | ||||
-rw-r--r-- | OpenSim/Services/GridService/GridService.cs | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Data/IRegionData.cs b/OpenSim/Data/IRegionData.cs index 41c74f2..140bc96 100644 --- a/OpenSim/Data/IRegionData.cs +++ b/OpenSim/Data/IRegionData.cs | |||
@@ -71,6 +71,7 @@ namespace OpenSim.Data | |||
71 | FallbackRegion = 2, // Regions we redirect to when the destination is down | 71 | FallbackRegion = 2, // Regions we redirect to when the destination is down |
72 | RegionOnline = 4, // Set when a region comes online, unset when it unregisters and DeleteOnUnregister is false | 72 | RegionOnline = 4, // Set when a region comes online, unset when it unregisters and DeleteOnUnregister is false |
73 | NoDirectLogin = 8, // Region unavailable for direct logins (by name) | 73 | NoDirectLogin = 8, // Region unavailable for direct logins (by name) |
74 | Persistent = 16 // Don't remove on unregister | 74 | Persistent = 16, // Don't remove on unregister |
75 | LockedOut = 32 // Don't allow registration | ||
75 | } | 76 | } |
76 | } | 77 | } |
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index 66bbff0..c48b10c 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs | |||
@@ -119,6 +119,9 @@ namespace OpenSim.Services.GridService | |||
119 | 119 | ||
120 | if (region != null) | 120 | if (region != null) |
121 | { | 121 | { |
122 | if ((Convert.ToInt32(region.Data["flags"]) & (int)OpenSim.Data.RegionFlags.LockedOut) != 0) | ||
123 | return false; | ||
124 | |||
122 | rdata.Data["flags"] = region.Data["flags"]; // Preserve fields | 125 | rdata.Data["flags"] = region.Data["flags"]; // Preserve fields |
123 | } | 126 | } |
124 | else | 127 | else |