if sited avatar cross fails, dont add it to physics and dont mess scripts

(?)
2014-07-22 16:28:30 +01:00 · 2014-07-22 16:28:30 +01:00 · f394fabfc0
parent fe900b28c6
commit f394fabfc0
1 changed files with 4 additions and 1 deletions
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@ -1679,6 +1679,9 @@ 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);

+                    if (agent.ParentUUID != UUID.Zero && agent.ParentID == 0)
+                        return false;
+
                    ReInstantiateScripts(agent);
                    agent.AddToPhysicalScene(isFlying);