From efd481085135f60d8f6d3e4615591a26ec3f05f6 Mon Sep 17 00:00:00 2001
From: CasperW
Date: Thu, 25 Feb 2010 12:04:51 +0100
Subject: Disable blocking teleports within the same parcel for now; it's not
 implemented correctly. Will review soon.

---
 OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs')

diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 9ceab19..5f84252 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -722,8 +722,10 @@ namespace OpenSim.Region.Framework.Scenes
                         //Don't restrict gods, estate managers, or land owners to the TP point. This behaviour mimics agni.
                         if (destLand.LandData.LandingType == (byte)1 && destLand.LandData.UserLocation != Vector3.Zero && avatar.GodLevel < 200 && !m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar.UUID) && destLand.LandData.OwnerID != avatar.UUID)
                         {
-                            avatar.ControllingClient.SendAgentAlertMessage("Can't TP to the destination; landing point set.", false);
-                            position = currentPos;
+                            //Disabling this behaviour for now pending review. ~CasperW
+
+                            //avatar.ControllingClient.SendAgentAlertMessage("Can't TP to the destination; landing point set.", false);
+                            //position = currentPos;
                         }
                     }
                     else
-- 
cgit v1.1