aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Land/LandObject.cs')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Land/LandObject.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
index 4a5948f..e52896a 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
@@ -300,7 +300,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
300 { 300 {
301 if (over.landData.localID == landData.localID) 301 if (over.landData.localID == landData.localID)
302 { 302 {
303 if ((over.landData.landFlags & (uint)Parcel.ParcelFlags.AllowDamage) != 0) 303 if (((over.landData.landFlags & (uint)Parcel.ParcelFlags.AllowDamage) != 0) && m_scene.RegionInfo.RegionSettings.AllowDamage)
304 avatars[i].Invulnerable = false; 304 avatars[i].Invulnerable = false;
305 else 305 else
306 avatars[i].Invulnerable = true; 306 avatars[i].Invulnerable = true;