diff options
author | teravus | 2013-08-24 05:55:53 -0500 |
---|---|---|
committer | teravus | 2013-09-16 11:32:05 -0500 |
commit | 1c7accf9500250abad243eaeb6f6baadf7644e78 (patch) | |
tree | edfbc728943f66186f2d18a02d57b28f75d2be5d /OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-1c7accf9500250abad243eaeb6f6baadf7644e78.zip opensim-SC_OLD-1c7accf9500250abad243eaeb6f6baadf7644e78.tar.gz opensim-SC_OLD-1c7accf9500250abad243eaeb6f6baadf7644e78.tar.bz2 opensim-SC_OLD-1c7accf9500250abad243eaeb6f6baadf7644e78.tar.xz |
* Fix a null ref that causes a stack unwind when crossing borders. Less stack unwinding.. the faster it goes.
* Tweak XEngine so that it's partially functional again. It's still not great, but basic things work.
(cherry picked from commit 01c3be27460fd3f28efd17b8d6606b883350f653)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs index 343cdb5..c52d586 100644 --- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | |||
@@ -182,6 +182,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule | |||
182 | try | 182 | try |
183 | { | 183 | { |
184 | ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); | 184 | ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); |
185 | if (obj == null) | ||
186 | return; | ||
185 | if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0 | 187 | if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0 |
186 | || avatar.Scene.RegionInfo.RegionSettings.AllowDamage) | 188 | || avatar.Scene.RegionInfo.RegionSettings.AllowDamage) |
187 | { | 189 | { |