From e79f266714c49923f8c5a9bb42b6869486fd50b0 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 4 Jan 2019 02:14:20 +0000 Subject: [PATCH] oops, thats elsewhere --- .../EntityTransfer/EntityTransferModule.cs | 2 +- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 515b1d6bbb..0f6d2f3062 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs @@ -2141,7 +2141,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer sp.KnownRegions = seeds; sp.SetNeighbourRegionSizeInfo(neighbours); - if(newneighbours.Count > 0 || previousRegionNeighbourHandles.Count > 0) + if(neighbours.Count > 0) { AgentPosition agentpos = new AgentPosition(); agentpos.AgentID = new UUID(sp.UUID.Guid); diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 7e20592fd3..fd4b3a3683 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -2338,16 +2338,9 @@ namespace OpenSim.Region.Framework.Scenes m_agentTransfer.EnableChildAgents(this); } } - if(gotCrossUpdate) - { - m_lastChildUpdatesTime = Util.EnvironmentTickCount() + 10000; - m_lastChildAgentUpdateDrawDistance = DrawDistance; - } - else - { - m_lastChildUpdatesTime = 0; - m_lastChildAgentUpdateDrawDistance = -1000; - } + + m_lastChildUpdatesTime = Util.EnvironmentTickCount() + 10000; + m_lastChildAgentUpdateDrawDistance = DrawDistance; m_lastChildAgentUpdateGodLevel = GodController.ViwerUIGodLevel; m_lastChildAgentUpdatePosition = AbsolutePosition; m_childUpdatesBusy = false; // allow them