aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs12
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
2 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 91f6501..121b2aa 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -1245,6 +1245,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
1245 flags |= RegionFlags.NoFly; 1245 flags |= RegionFlags.NoFly;
1246 if (Scene.RegionInfo.RegionSettings.RestrictPushing) 1246 if (Scene.RegionInfo.RegionSettings.RestrictPushing)
1247 flags |= RegionFlags.RestrictPushObject; 1247 flags |= RegionFlags.RestrictPushObject;
1248 if (Scene.RegionInfo.RegionSettings.AllowLandJoinDivide)
1249 flags |= RegionFlags.AllowParcelChanges;
1248 if (Scene.RegionInfo.RegionSettings.BlockShowInSearch) 1250 if (Scene.RegionInfo.RegionSettings.BlockShowInSearch)
1249 flags |= RegionFlags.BlockParcelSearch; 1251 flags |= RegionFlags.BlockParcelSearch;
1250 1252
@@ -1254,6 +1256,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
1254 flags |= RegionFlags.Sandbox; 1256 flags |= RegionFlags.Sandbox;
1255 if (Scene.RegionInfo.EstateSettings.AllowVoice) 1257 if (Scene.RegionInfo.EstateSettings.AllowVoice)
1256 flags |= RegionFlags.AllowVoice; 1258 flags |= RegionFlags.AllowVoice;
1259 if (Scene.RegionInfo.EstateSettings.AllowLandmark)
1260 flags |= RegionFlags.AllowLandmark;
1261 if (Scene.RegionInfo.EstateSettings.AllowSetHome)
1262 flags |= RegionFlags.AllowSetHome;
1257 if (Scene.RegionInfo.EstateSettings.BlockDwell) 1263 if (Scene.RegionInfo.EstateSettings.BlockDwell)
1258 flags |= RegionFlags.BlockDwell; 1264 flags |= RegionFlags.BlockDwell;
1259 if (Scene.RegionInfo.EstateSettings.ResetHomeOnTeleport) 1265 if (Scene.RegionInfo.EstateSettings.ResetHomeOnTeleport)
@@ -1299,6 +1305,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
1299 flags |= RegionFlags.ResetHomeOnTeleport; 1305 flags |= RegionFlags.ResetHomeOnTeleport;
1300 if (Scene.RegionInfo.EstateSettings.TaxFree) 1306 if (Scene.RegionInfo.EstateSettings.TaxFree)
1301 flags |= RegionFlags.TaxFree; 1307 flags |= RegionFlags.TaxFree;
1308 if (Scene.RegionInfo.EstateSettings.AllowLandmark)
1309 flags |= RegionFlags.AllowLandmark;
1310 if (Scene.RegionInfo.EstateSettings.AllowParcelChanges)
1311 flags |= RegionFlags.AllowParcelChanges;
1312 if (Scene.RegionInfo.EstateSettings.AllowSetHome)
1313 flags |= RegionFlags.AllowSetHome;
1302 if (Scene.RegionInfo.EstateSettings.DenyMinors) 1314 if (Scene.RegionInfo.EstateSettings.DenyMinors)
1303 flags |= (RegionFlags)(1 << 30); 1315 flags |= (RegionFlags)(1 << 30);
1304 1316
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 2aba2dd..1fa2fc7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4188,8 +4188,6 @@ namespace OpenSim.Region.Framework.Scenes
4188 m_log.DebugFormat( 4188 m_log.DebugFormat(
4189 "[SCENE]: Incoming child agent update for {0} in {1}", cAgentData.AgentID, RegionInfo.RegionName); 4189 "[SCENE]: Incoming child agent update for {0} in {1}", cAgentData.AgentID, RegionInfo.RegionName);
4190 4190
4191 // XPTO: if this agent is not allowed here as root, always return false
4192
4193 // TODO: This check should probably be in QueryAccess(). 4191 // TODO: This check should probably be in QueryAccess().
4194 ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID, Constants.RegionSize / 2, Constants.RegionSize / 2); 4192 ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID, Constants.RegionSize / 2, Constants.RegionSize / 2);
4195 if (nearestParcel == null) 4193 if (nearestParcel == null)