diff options
author | UbitUmarov | 2014-07-24 00:56:48 +0100 |
---|---|---|
committer | UbitUmarov | 2014-07-24 00:56:48 +0100 |
commit | 9936f13c1ba514206634417fde35cd38e519ebf7 (patch) | |
tree | 0f35cebdb27bdcf5aea4763740a289e15e8662bf /OpenSim/Region/CoreModules | |
parent | fix line ending (diff) | |
download | opensim-SC_OLD-9936f13c1ba514206634417fde35cd38e519ebf7.zip opensim-SC_OLD-9936f13c1ba514206634417fde35cd38e519ebf7.tar.gz opensim-SC_OLD-9936f13c1ba514206634417fde35cd38e519ebf7.tar.bz2 opensim-SC_OLD-9936f13c1ba514206634417fde35cd38e519ebf7.tar.xz |
on transfer fail of sited avatars, only do
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index d3247d9..b497e2f 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 | |||
1679 | "[ENTITY TRANSFER MODULE]: Region {0} would not accept update for agent {1} on cross attempt. Returning to original region.", | 1679 | "[ENTITY TRANSFER MODULE]: Region {0} would not accept update for agent {1} on cross attempt. Returning to original region.", |
1680 | neighbourRegion.RegionName, agent.Name); | 1680 | neighbourRegion.RegionName, agent.Name); |
1681 | 1681 | ||
1682 | ReInstantiateScripts(agent); | ||
1682 | if (agent.ParentUUID != UUID.Zero && agent.ParentID == 0) | 1683 | if (agent.ParentUUID != UUID.Zero && agent.ParentID == 0) |
1683 | return false; | 1684 | return false; |
1684 | 1685 | ||
1685 | ReInstantiateScripts(agent); | ||
1686 | agent.AddToPhysicalScene(isFlying); | 1686 | agent.AddToPhysicalScene(isFlying); |
1687 | 1687 | ||
1688 | return false; | 1688 | return false; |