ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 22:26:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Fix a null ref that causes a stack unwind when crossing borders. Less stack unwinding.. the faster it goes.

Browse Source 
* Tweak XEngine so that it's partially functional again.    It's still not great, but basic things work.
This commit is contained in:
teravus
2013-08-24 05:55:53 -05:00
parent 58359788a9
commit 01c3be2746
3 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
View File

@@ -182,6 +182,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
try
{
ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
if (obj == null)
return;
if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0
|| avatar.Scene.RegionInfo.RegionSettings.AllowDamage)
{