From eaf9383b599041c86877cb11a698ae7ad4be8d46 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Mon, 14 Jul 2008 01:32:16 +0000
Subject: Patch #9149 Make all of the toggles go live. Utilizes the new
 database table for almost everything. Remove lots of now unneeded settings
 from the EstateSettings class

---
 OpenSim/Region/Environment/Modules/World/Land/LandObject.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Environment/Modules/World/Land')

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
                 {
                     if (over.landData.localID == landData.localID)
                     {
-                        if ((over.landData.landFlags & (uint)Parcel.ParcelFlags.AllowDamage) != 0)
+                        if (((over.landData.landFlags & (uint)Parcel.ParcelFlags.AllowDamage) != 0) && m_scene.RegionInfo.RegionSettings.AllowDamage)
                             avatars[i].Invulnerable = false;
                         else
                             avatars[i].Invulnerable = true;
-- 
cgit v1.1