From 188d86998d14d23a59e345568add8ece7f5a0641 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 28 Jan 2011 04:09:04 +0000
Subject: Fix up QueryAccess to also check parcels

---
 .../CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules/Framework')

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 7804b7f..54b95f7 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -284,6 +284,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     return;
                 }
 
+                if (!m_aScene.SimulationService.QueryAccess(finalDestination, sp.ControllingClient.AgentId, Vector3.Zero))
+                {
+                    sp.ControllingClient.SendTeleportFailed("The destination region has refused access");
+                    return;
+                }
+
                 sp.ControllingClient.SendTeleportStart(teleportFlags);
 
                 // the avatar.Close below will clear the child region list. We need this below for (possibly)
@@ -772,8 +778,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             GridRegion neighbourRegion = scene.GridService.GetRegionByPosition(scene.RegionInfo.ScopeID, (int)x, (int)y);
 
-            if (!scene.SimulationService.QueryAccess(neighbourRegion, agent.ControllingClient.AgentId))
+            if (!scene.SimulationService.QueryAccess(neighbourRegion, agent.ControllingClient.AgentId, newpos))
             {
+                agent.ControllingClient.SendAlertMessage("Cannot region cross into banned parcel");
                 if (r == null)
                 {
                     r = new ExpiringCache<ulong, DateTime>();
-- 
cgit v1.1