From a534257b0e0861bb7656389675044fa905a11bf4 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Fri, 25 Apr 2008 21:41:55 +0000 Subject: * Fixes prim crossing. See bug 1050. * Causes the internal handling of attachments to put the prim group conceptually at the position of the avatar instead of 0,0,0 --- OpenSim/Region/Environment/PermissionManager.cs | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'OpenSim/Region/Environment/PermissionManager.cs') diff --git a/OpenSim/Region/Environment/PermissionManager.cs b/OpenSim/Region/Environment/PermissionManager.cs index 0343d21..5658be7 100644 --- a/OpenSim/Region/Environment/PermissionManager.cs +++ b/OpenSim/Region/Environment/PermissionManager.cs @@ -168,12 +168,25 @@ namespace OpenSim.Region.Environment /// Has permission? public virtual bool CanObjectEntry(LLUUID user, LLVector3 oldPos, LLVector3 newPos) { + + + if ((newPos.X > 257f || newPos.X < -1f || newPos.Y > 257f || newPos.Y < -1f)) + { + return true; + } + ILandObject land1 = m_scene.LandChannel.getLandObject(oldPos.X, oldPos.Y); ILandObject land2 = m_scene.LandChannel.getLandObject(newPos.X, newPos.Y); + if (land1 == null || land2 == null) { return false; } + if (land2 == null) + { + // need this for crossing borders + return true; + } if (land1.landData.globalID == land2.landData.globalID) { -- cgit v1.1