diff options
| author | dr scofield (aka dirk husemann) | 2009-10-02 11:10:52 +0200 |
|---|---|---|
| committer | dr scofield (aka dirk husemann) | 2009-10-02 11:31:30 +0200 |
| commit | 2107b67f1b145f7718fdb1450be1a7b8dd1a0bf7 (patch) | |
| tree | 74913862b829b7e56994f2c33ca5fe35638baad1 /OpenSim/Region/CoreModules/Avatar | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-2107b67f1b145f7718fdb1450be1a7b8dd1a0bf7.zip opensim-SC_OLD-2107b67f1b145f7718fdb1450be1a7b8dd1a0bf7.tar.gz opensim-SC_OLD-2107b67f1b145f7718fdb1450be1a7b8dd1a0bf7.tar.bz2 opensim-SC_OLD-2107b67f1b145f7718fdb1450be1a7b8dd1a0bf7.tar.xz | |
- cleaning up LandData/ILandObject capitalization issues
- adding LandDataSerializer to OAR mechanics
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs index 87f137e..9387bce 100644 --- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | |||
| @@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule | |||
| 146 | private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, UUID regionID) | 146 | private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, UUID regionID) |
| 147 | { | 147 | { |
| 148 | ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); | 148 | ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); |
| 149 | if ((obj.landData.Flags & (uint)ParcelFlags.AllowDamage) != 0) | 149 | if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0) |
| 150 | { | 150 | { |
| 151 | avatar.Invulnerable = false; | 151 | avatar.Invulnerable = false; |
| 152 | } | 152 | } |