diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Combat')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs index c52d586..b0b7054 100644 --- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | |||
@@ -31,6 +31,7 @@ using Nini.Config; | |||
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using OpenSim.Region.Framework.Interfaces; | 32 | using OpenSim.Region.Framework.Interfaces; |
33 | using OpenSim.Region.Framework.Scenes; | 33 | using OpenSim.Region.Framework.Scenes; |
34 | using OpenSim.Services.Interfaces; | ||
34 | using OpenMetaverse; | 35 | using OpenMetaverse; |
35 | 36 | ||
36 | using Mono.Addins; | 37 | using Mono.Addins; |
@@ -182,8 +183,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule | |||
182 | try | 183 | try |
183 | { | 184 | { |
184 | 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 | <<<<<<< HEAD | ||
187 | |||
188 | if (obj == null) | ||
189 | return; | ||
190 | |||
191 | ======= | ||
185 | if (obj == null) | 192 | if (obj == null) |
186 | return; | 193 | return; |
194 | >>>>>>> avn/ubitvar | ||
187 | if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0 | 195 | if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0 |
188 | || avatar.Scene.RegionInfo.RegionSettings.AllowDamage) | 196 | || avatar.Scene.RegionInfo.RegionSettings.AllowDamage) |
189 | { | 197 | { |