diff options
author | Justin Clark-Casey (justincc) | 2014-03-06 00:11:13 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-03-06 00:11:13 +0000 |
commit | 14569992e149b4c6ee097d88e3f5034edd653645 (patch) | |
tree | 458e4fb3f08567b29bec0ad141e05a3cf71e20d7 /OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | |
parent | Add UUID and ready status (whether region has finished starting up) to "show ... (diff) | |
download | opensim-SC_OLD-14569992e149b4c6ee097d88e3f5034edd653645.zip opensim-SC_OLD-14569992e149b4c6ee097d88e3f5034edd653645.tar.gz opensim-SC_OLD-14569992e149b4c6ee097d88e3f5034edd653645.tar.bz2 opensim-SC_OLD-14569992e149b4c6ee097d88e3f5034edd653645.tar.xz |
Prevent adding a land object if it overlaps any existing objects that have not had their bitmaps adjusted.
This is to prevent an immediate problem in http://opensimulator.org/mantis/view.php?id=7035 where a development code bug occasionally overlays all the existing parcels with a blank parcel owned by the estate manager and to gather more data.
My guess is that this parcel is being created by the new code in LandManagementModule.GetLandObject(), probably some race between threads since this only happens occasionally.
Adds regression tests for this case and for parcel subdivide.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs index 343cdb5..66325b4 100644 --- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | |||
@@ -182,6 +182,10 @@ 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 | |||
186 | if (obj == null) | ||
187 | return; | ||
188 | |||
185 | if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0 | 189 | if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0 |
186 | || avatar.Scene.RegionInfo.RegionSettings.AllowDamage) | 190 | || avatar.Scene.RegionInfo.RegionSettings.AllowDamage) |
187 | { | 191 | { |