* 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

1 files changed, 13 insertions, 0 deletions

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
         /// <returns>Has permission?</returns>
         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)
             {