From f394fabfc0a7ff4b81a238f6aaf965514419cea4 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 22 Jul 2014 16:28:30 +0100
Subject: if sited avatar cross fails, dont add it to physics and dont mess
 scripts (?)

---
 .../CoreModules/Framework/EntityTransfer/EntityTransferModule.cs     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'OpenSim')

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);
-- 
cgit v1.1