diff options
| author | Melanie | 2009-10-02 19:03:22 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-02 19:03:22 +0100 |
| commit | ce8974539e2de92e0a16a49ae560ecf5aac5e7d3 (patch) | |
| tree | a8f426b248dd22581c05f786498d6347b62f5825 /OpenSim/Region/CoreModules/Avatar | |
| parent | Merge branch 'diva-textures-osgrid' into diva-textures (diff) | |
| parent | Added a default for grid services in standalone. (diff) | |
| download | opensim-SC_OLD-ce8974539e2de92e0a16a49ae560ecf5aac5e7d3.zip opensim-SC_OLD-ce8974539e2de92e0a16a49ae560ecf5aac5e7d3.tar.gz opensim-SC_OLD-ce8974539e2de92e0a16a49ae560ecf5aac5e7d3.tar.bz2 opensim-SC_OLD-ce8974539e2de92e0a16a49ae560ecf5aac5e7d3.tar.xz | |
Merge branch 'master' into diva-textures
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 | } |