3 files changed, 25 insertions, 25 deletions

diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 1c503aa..f6d4b40 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -94,8 +94,11 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         // caches ExtendedLandData
         private Cache parcelInfoCache;
-        private Dictionary<UUID, Vector3> forcedPosition =
-                new Dictionary<UUID, Vector3>();
+
+        /// <summary>
+        /// Record positions that avatar's are currently being forced to move to due to parcel entry restrictions.
+        /// </summary>
+        private Dictionary<UUID, Vector3> forcedPosition = new Dictionary<UUID, Vector3>();
 
         #region INonSharedRegionModule Members
 
@@ -224,22 +227,34 @@ namespace OpenSim.Region.CoreModules.World.Land
                 //When the avatar walks into a ban line on the ground, it prevents getting stuck
                 agentData.ControlFlags = (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY;
 
-
                 //Make sure we stop if they get about to the right place to prevent yoyo and prevents getting stuck on banlines
                 if (Vector3.Distance(clientAvatar.AbsolutePosition, forcedPosition[remoteClient.AgentId]) < .2)
                 {
-                    Debug.WriteLine(string.Format("Stopping force position because {0} is close enough to position {1}", forcedPosition[remoteClient.AgentId], clientAvatar.AbsolutePosition));
+//                    m_log.DebugFormat(
+//                        "[LAND MANAGEMENT MODULE]: Stopping force position of {0} because {1} is close enough to {2}",
+//                        clientAvatar.Name, clientAvatar.AbsolutePosition, forcedPosition[remoteClient.AgentId]);
+
                     forcedPosition.Remove(remoteClient.AgentId);
                 }
                 //if we are far away, teleport
                 else if (Vector3.Distance(clientAvatar.AbsolutePosition, forcedPosition[remoteClient.AgentId]) > 3)
                 {
-                    Debug.WriteLine(string.Format("Teleporting out because {0} is too far from avatar position {1}", forcedPosition[remoteClient.AgentId], clientAvatar.AbsolutePosition));
-                    clientAvatar.Teleport(forcedPosition[remoteClient.AgentId]);
+                    Vector3 forcePosition = forcedPosition[remoteClient.AgentId];
+//                    m_log.DebugFormat(
+//                        "[LAND MANAGEMENT MODULE]: Teleporting out {0} because {1} is too far from avatar position {2}",
+//                        clientAvatar.Name, clientAvatar.AbsolutePosition, forcePosition);
+
+                    m_scene.RequestTeleportLocation(remoteClient, m_scene.RegionInfo.RegionHandle,
+                        forcePosition, clientAvatar.Lookat, (uint)Constants.TeleportFlags.ForceRedirect);
+
                     forcedPosition.Remove(remoteClient.AgentId);
                 }
                 else
                 {
+//                    m_log.DebugFormat(
+//                        "[LAND MANAGEMENT MODULE]: Forcing {0} from {1} to {2}",
+//                        clientAvatar.Name, clientAvatar.AbsolutePosition, forcedPosition[remoteClient.AgentId]);
+
                     //Forces them toward the forced position we want if they aren't there yet
                     agentData.UseClientAgentPosition = true;
                     agentData.ClientAgentPosition = forcedPosition[remoteClient.AgentId];
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index f3c6a30..7023984 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -677,18 +677,12 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             bool permission = false;
             bool locked = false;
 
-            if (!m_scene.Entities.ContainsKey(objId))
-            {
-                return false;
-            }
+            SceneObjectPart part = m_scene.GetSceneObjectPart(objId);
 
-            // If it's not an object, we cant edit it.
-            if ((!(m_scene.Entities[objId] is SceneObjectGroup)))
-            {
+            if (part == null)
                 return false;
-            }
 
-            SceneObjectGroup group = (SceneObjectGroup)m_scene.Entities[objId];
+            SceneObjectGroup group = part.ParentGroup;
 
             UUID objectOwner = group.OwnerID;
             locked = ((group.RootPart.OwnerMask & PERM_LOCKED) == 0);
@@ -977,16 +971,6 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
-            SceneObjectPart part = m_scene.GetSceneObjectPart(objectID);
-
-            // If we selected a sub-prim to edit, the objectID won't represent the object, but only a part.
-            // We have to check the permissions of the group, though.
-            if (part.ParentID != 0)
-            {
-                objectID = part.ParentUUID;
-                part = m_scene.GetSceneObjectPart(objectID);
-            }
-
             return GenericObjectPermission(editorID, objectID, false);
         }
 
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index b315d2c..74b047b 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -351,6 +351,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 process,
                 string.Format("MapItemRequestThread ({0})", m_scene.RegionInfo.RegionName),
                 ThreadPriority.BelowNormal,
+                true,
                 true);
         }