aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/IRegionData.cs3
-rw-r--r--OpenSim/Services/GridService/GridService.cs3
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