aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorBlueWall2013-09-12 11:46:12 -0400
committerJustin Clark-Casey (justincc)2013-09-20 21:37:56 +0100
commit560ea54c981651dae584f5c6321984bf6fe84a03 (patch)
treee3c2e048ccf2d395e796a34a0e32a78c4237dd7e /OpenSim/Region
parentBulletSim: remove collision cache clearing logic for physical objects. (diff)
downloadopensim-SC_OLD-560ea54c981651dae584f5c6321984bf6fe84a03.zip
opensim-SC_OLD-560ea54c981651dae584f5c6321984bf6fe84a03.tar.gz
opensim-SC_OLD-560ea54c981651dae584f5c6321984bf6fe84a03.tar.bz2
opensim-SC_OLD-560ea54c981651dae584f5c6321984bf6fe84a03.tar.xz
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.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs3
1 files changed, 3 insertions, 0 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}",