From 9936f13c1ba514206634417fde35cd38e519ebf7 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 24 Jul 2014 00:56:48 +0100 Subject: [PATCH] on transfer fail of sited avatars, only do --- .../Framework/EntityTransfer/EntityTransferModule.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index d3247d9ee4..b497e2fb25 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs @@ -1679,10 +1679,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer "[ENTITY TRANSFER MODULE]: Region {0} would not accept update for agent {1} on cross attempt. Returning to original region.", neighbourRegion.RegionName, agent.Name); + ReInstantiateScripts(agent); if (agent.ParentUUID != UUID.Zero && agent.ParentID == 0) return false; - - ReInstantiateScripts(agent); + agent.AddToPhysicalScene(isFlying); return false;