diff options
author | Justin Clark-Casey (justincc) | 2010-05-03 21:34:38 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-05-15 01:07:34 +0100 |
commit | dd1b99cd0d83342cece72be6b39cf0c29527224f (patch) | |
tree | f51c1941af54a9244734722c172f6fc01a6dd36e /OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | |
parent | remove unrequired [Groups] section from GridCommon.ini.example, as per Nebadon (diff) | |
download | opensim-SC_OLD-dd1b99cd0d83342cece72be6b39cf0c29527224f.zip opensim-SC_OLD-dd1b99cd0d83342cece72be6b39cf0c29527224f.tar.gz opensim-SC_OLD-dd1b99cd0d83342cece72be6b39cf0c29527224f.tar.bz2 opensim-SC_OLD-dd1b99cd0d83342cece72be6b39cf0c29527224f.tar.xz |
Address symptom of Mantis 4588 (though not the cause) by moving the avatar dereference inside the exception catch
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs index 1a6cd6c..4bcfaac 100644 --- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | |||
@@ -146,10 +146,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule | |||
146 | } | 146 | } |
147 | 147 | ||
148 | private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, UUID regionID) | 148 | private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, UUID regionID) |
149 | { | 149 | { |
150 | ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); | ||
151 | try | 150 | try |
152 | { | 151 | { |
152 | ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); | ||
153 | |||
153 | if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0) | 154 | if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0) |
154 | { | 155 | { |
155 | avatar.Invulnerable = false; | 156 | avatar.Invulnerable = false; |