diff options
| author | Melanie Thielker | 2008-07-14 01:32:16 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-07-14 01:32:16 +0000 |
| commit | eaf9383b599041c86877cb11a698ae7ad4be8d46 (patch) | |
| tree | df5561fae3aeff44c19e5a625ad818f8ee08606b /OpenSim/Region/Environment/Modules/World/Land | |
| parent | Patch #9148 (diff) | |
| download | opensim-SC-eaf9383b599041c86877cb11a698ae7ad4be8d46.zip opensim-SC-eaf9383b599041c86877cb11a698ae7ad4be8d46.tar.gz opensim-SC-eaf9383b599041c86877cb11a698ae7ad4be8d46.tar.bz2 opensim-SC-eaf9383b599041c86877cb11a698ae7ad4be8d46.tar.xz | |
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
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Land')
| -rw-r--r-- | OpenSim/Region/Environment/Modules/World/Land/LandObject.cs | 2 |
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; |