From 3c85afbb431d14a676c00d20bfeeb5e2d13e8eaf Mon Sep 17 00:00:00 2001 From: BlueWall Date: Thu, 12 Sep 2013 11:46:12 -0400 Subject: [PATCH] Allow setting the EntityTransfer-max_distance to 0 to override distance checks. This is to facilitate current viewer work fixing the distance limitations for teleporting. --- .../Framework/EntityTransfer/EntityTransferModule.cs | 3 +++ bin/OpenSimDefaults.ini | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 4219254aa4..9302784173 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs @@ -518,6 +518,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer /// private bool IsWithinMaxTeleportDistance(RegionInfo sourceRegion, GridRegion destRegion) { + if(MaxTransferDistance == 0) + return true; + // m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Source co-ords are x={0} y={1}", curRegionX, curRegionY); // // m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Final dest is x={0} y={1} {2}@{3}", diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index e168566e15..c16dee2aee 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -652,8 +652,11 @@ [EntityTransfer] - ; The maximum distance in regions that an agent is allowed to teleport along the x or y axis - ; This is set to 16383 because current viewers can't handle teleports that are greater than this distance + ; The maximum distance in regions that an agent is allowed to teleport + ; along the x or y axis. This is set to 16383 because current viewers + ; can't handle teleports that are greater than this distance + ; Setting to 0 will allow teleports of any distance + ; max_distance = 16383 ; Minimum user level required for HyperGrid teleports