From bafa82eb12070279090b76fb6d38fda1c29ab859 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 26 Aug 2014 18:25:14 +0100
Subject: Remove race conditions from where SP.AbsolutePosition could change
 between the various property checks.

---
 OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 55ef61d..11b079f 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -525,16 +525,13 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// </summary>
         /// <param name="avatar"></param>
         public void EventManagerOnClientMovement(ScenePresence avatar)
-        //
         {
-            ILandObject over = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
+            Vector3 pos = avatar.AbsolutePosition;
+            ILandObject over = GetLandObject(pos.X, pos.Y);
             if (over != null)
             {
-                if (!over.IsRestrictedFromLand(avatar.UUID) && (!over.IsBannedFromLand(avatar.UUID) || avatar.AbsolutePosition.Z >= LandChannel.BAN_LINE_SAFETY_HIEGHT))
-                {
-                    avatar.lastKnownAllowedPosition =
-                        new Vector3(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, avatar.AbsolutePosition.Z);
-                }
+                if (!over.IsRestrictedFromLand(avatar.UUID) && (!over.IsBannedFromLand(avatar.UUID) || pos.Z >= LandChannel.BAN_LINE_SAFETY_HIEGHT))
+                    avatar.lastKnownAllowedPosition = pos;
             }
         }
 
-- 
cgit v1.1