1 files changed, 4 insertions, 1 deletions

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 5fea0cf..037f143 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1677,7 +1677,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
                     m_log.WarnFormat(
                         "[ENTITY TRANSFER MODULE]: Region {0} would not accept update for agent {1} on cross attempt.  Returning to original region.", 
-                        neighbourRegion.RegionName, agent.Name);
+                        neighbourRegion.RegionName, agent.Name);

+

+                    if (agent.ParentUUID != UUID.Zero && agent.ParentID == 0)

+                        return false;
 
                     ReInstantiateScripts(agent);
                     agent.AddToPhysicalScene(isFlying);