diff options
author | UbitUmarov | 2014-08-15 19:05:27 +0100 |
---|---|---|
committer | UbitUmarov | 2014-08-15 19:05:27 +0100 |
commit | a3e45a45bcd796a0ebfaff9a682e08df469d052a (patch) | |
tree | f8dc05937ace8a257b2d3dd0485a476b099ebb7f | |
parent | let failed crossing say something abotu reason (diff) | |
download | opensim-SC-a3e45a45bcd796a0ebfaff9a682e08df469d052a.zip opensim-SC-a3e45a45bcd796a0ebfaff9a682e08df469d052a.tar.gz opensim-SC-a3e45a45bcd796a0ebfaff9a682e08df469d052a.tar.bz2 opensim-SC-a3e45a45bcd796a0ebfaff9a682e08df469d052a.tar.xz |
refix hide on crossings
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index cde7f60..d326941 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -1752,6 +1752,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1752 | // Unlike a teleport, here we do not wait for the destination region to confirm the receipt. | 1752 | // Unlike a teleport, here we do not wait for the destination region to confirm the receipt. |
1753 | m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.CleaningUp); | 1753 | m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.CleaningUp); |
1754 | 1754 | ||
1755 | agent.parcelRegionCross(false); | ||
1756 | |||
1755 | agent.MakeChildAgent(); | 1757 | agent.MakeChildAgent(); |
1756 | 1758 | ||
1757 | // FIXME: Possibly this should occur lower down after other commands to close other agents, | 1759 | // FIXME: Possibly this should occur lower down after other commands to close other agents, |
@@ -1765,7 +1767,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1765 | // agent.SendOtherAgentsAvatarDataToMe(); | 1767 | // agent.SendOtherAgentsAvatarDataToMe(); |
1766 | // agent.SendOtherAgentsAppearanceToMe(); | 1768 | // agent.SendOtherAgentsAppearanceToMe(); |
1767 | 1769 | ||
1768 | agent.parcelRegionCross(false); | ||
1769 | 1770 | ||
1770 | // Backwards compatibility. Best effort | 1771 | // Backwards compatibility. Best effort |
1771 | if (version == "Unknown" || version == string.Empty) | 1772 | if (version == "Unknown" || version == string.Empty) |