diff options
| author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
| commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
| tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Region/CoreModules/Avatar/Combat | |
| parent | remove lixo (diff) | |
| parent | dont change camera on crossings (diff) | |
| download | opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz | |
bad merge?
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Combat')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs index fc23b72..b0b7054 100644 --- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | |||
| @@ -183,10 +183,15 @@ 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 | <<<<<<< HEAD | ||
| 186 | 187 | ||
| 187 | if (obj == null) | 188 | if (obj == null) |
| 188 | return; | 189 | return; |
| 189 | 190 | ||
| 191 | ======= | ||
| 192 | if (obj == null) | ||
| 193 | return; | ||
| 194 | >>>>>>> avn/ubitvar | ||
| 190 | if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0 | 195 | if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0 |
| 191 | || avatar.Scene.RegionInfo.RegionSettings.AllowDamage) | 196 | || avatar.Scene.RegionInfo.RegionSettings.AllowDamage) |
| 192 | { | 197 | { |