if sited avatar cross fails, dont add it to physics and dont mess scripts
(?)avinationmerge
parent
fe900b28c6
commit
f394fabfc0
|
@ -1677,7 +1677,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
|
||||||
|
|
||||||
m_log.WarnFormat(
|
m_log.WarnFormat(
|
||||||
"[ENTITY TRANSFER MODULE]: Region {0} would not accept update for agent {1} on cross attempt. Returning to original region.",
|
"[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);
|
ReInstantiateScripts(agent);
|
||||||
agent.AddToPhysicalScene(isFlying);
|
agent.AddToPhysicalScene(isFlying);
|
||||||
|
|
Loading…
Reference in New Issue