diff options
| author | onefang | 2019-05-19 21:24:15 +1000 |
|---|---|---|
| committer | onefang | 2019-05-19 21:24:15 +1000 |
| commit | 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb (patch) | |
| tree | a9fbc62df9eb2d1d9ba2698d8552eae71eca20d8 /OpenSim/Region/CoreModules/Avatar/Combat | |
| parent | Add a build script. (diff) | |
| download | opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.zip opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.gz opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.bz2 opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.xz | |
Dump OpenSim 0.9.0.1 into it's own branch.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Combat')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs index fc23b72..4e1958a 100644 --- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | |||
| @@ -183,10 +183,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule | |||
| 183 | try | 183 | try |
| 184 | { | 184 | { |
| 185 | ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); | 185 | ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); |
| 186 | |||
| 187 | if (obj == null) | 186 | if (obj == null) |
| 188 | return; | 187 | return; |
| 189 | |||
| 190 | if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0 | 188 | if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0 |
| 191 | || avatar.Scene.RegionInfo.RegionSettings.AllowDamage) | 189 | || avatar.Scene.RegionInfo.RegionSettings.AllowDamage) |
| 192 | { | 190 | { |