aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-05-03 21:34:38 +0100
committerJustin Clark-Casey2010-05-15 01:07:45 +0100
commit98f2b798ff9e23c3cbc2fdf33d6ea4956b80ba8a (patch)
tree25d093371bb4a898a9ca3641a39354ed1831e6b6
parentApply patch from http://opensimulator.org/mantis/bug_view_page.php?bug_id=4671 (diff)
downloadopensim-SC_OLD-98f2b798ff9e23c3cbc2fdf33d6ea4956b80ba8a.zip
opensim-SC_OLD-98f2b798ff9e23c3cbc2fdf33d6ea4956b80ba8a.tar.gz
opensim-SC_OLD-98f2b798ff9e23c3cbc2fdf33d6ea4956b80ba8a.tar.bz2
opensim-SC_OLD-98f2b798ff9e23c3cbc2fdf33d6ea4956b80ba8a.tar.xz
Address symptom of Mantis 4588 (though not the cause) by moving the avatar dereference inside the exception catch
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs5
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 9df6074..a895d6e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
@@ -143,10 +143,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
143 } 143 }
144 144
145 private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, UUID regionID) 145 private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, UUID regionID)
146 { 146 {
147 ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
148 try 147 try
149 { 148 {
149 ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
150
150 if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0) 151 if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0)
151 { 152 {
152 avatar.Invulnerable = false; 153 avatar.Invulnerable = false;