diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 3 | ||||
-rw-r--r-- | 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 4219254..9302784 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 | |||
518 | /// </returns> | 518 | /// </returns> |
519 | private bool IsWithinMaxTeleportDistance(RegionInfo sourceRegion, GridRegion destRegion) | 519 | private bool IsWithinMaxTeleportDistance(RegionInfo sourceRegion, GridRegion destRegion) |
520 | { | 520 | { |
521 | if(MaxTransferDistance == 0) | ||
522 | return true; | ||
523 | |||
521 | // m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Source co-ords are x={0} y={1}", curRegionX, curRegionY); | 524 | // m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Source co-ords are x={0} y={1}", curRegionX, curRegionY); |
522 | // | 525 | // |
523 | // m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Final dest is x={0} y={1} {2}@{3}", | 526 | // 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 e168566..c16dee2 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -652,8 +652,11 @@ | |||
652 | 652 | ||
653 | 653 | ||
654 | [EntityTransfer] | 654 | [EntityTransfer] |
655 | ; The maximum distance in regions that an agent is allowed to teleport along the x or y axis | 655 | ; The maximum distance in regions that an agent is allowed to teleport |
656 | ; This is set to 16383 because current viewers can't handle teleports that are greater than this distance | 656 | ; along the x or y axis. This is set to 16383 because current viewers |
657 | ; can't handle teleports that are greater than this distance | ||
658 | ; Setting to 0 will allow teleports of any distance | ||
659 | ; | ||
657 | max_distance = 16383 | 660 | max_distance = 16383 |
658 | 661 | ||
659 | ; Minimum user level required for HyperGrid teleports | 662 | ; Minimum user level required for HyperGrid teleports |