From 1207f61f79667608c3f172a8c8158f122fa954d7 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 14 Aug 2020 02:37:07 +0100 Subject: [PATCH] change tp callback condition --- OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 1 - .../Framework/EntityTransfer/EntityTransferModule.cs | 9 +++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index 920983de1b..7e44492eb5 100755 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs @@ -545,7 +545,6 @@ namespace OpenSim.Region.CoreModules.Asset private bool CheckFromFileCache(string id) { - string filename = GetFileName(id); try { return File.Exists(GetFileName(id)); diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 896583bff4..b8a78dc6af 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs @@ -79,11 +79,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer if (!disposed) { disposed = true; - if(m_bannedRegionCache != null) - { - m_bannedRegionCache.Dispose(); - m_bannedRegionCache = null; - } + m_bannedRegionCache?.Dispose(); + m_bannedRegionCache = null; } } @@ -1202,7 +1199,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer agent.SenderWantsToWaitForRoot = true; - if(!sp.IsInLocalTransit || sp.RegionViewDistance == 0) + if(OutSideViewRange) SetNewCallbackURL(agent, sp.Scene.RegionInfo); // Reset the do not close flag. This must be done before the destination opens child connections (here