diff options
author | UbitUmarov | 2014-08-15 19:21:32 +0100 |
---|---|---|
committer | UbitUmarov | 2014-08-15 19:21:32 +0100 |
commit | 3e6f49f3be27f5918c4d6322c1882b8267bd4855 (patch) | |
tree | 41451975927a4a08329236cfe022888139917b2c /OpenSim/Region | |
parent | refix hide on crossings (diff) | |
download | opensim-SC_OLD-3e6f49f3be27f5918c4d6322c1882b8267bd4855.zip opensim-SC_OLD-3e6f49f3be27f5918c4d6322c1882b8267bd4855.tar.gz opensim-SC_OLD-3e6f49f3be27f5918c4d6322c1882b8267bd4855.tar.bz2 opensim-SC_OLD-3e6f49f3be27f5918c4d6322c1882b8267bd4855.tar.xz |
do CrossAttachmentsIntoNewRegion for old versions in the right place
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index d326941..84ca52d 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -1746,6 +1746,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1746 | capsPath); | 1746 | capsPath); |
1747 | } | 1747 | } |
1748 | 1748 | ||
1749 | // Backwards compatibility. Best effort | ||
1750 | if (version == "Unknown" || version == string.Empty) | ||
1751 | { | ||
1752 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: neighbor with old version, passing attachments one by one..."); | ||
1753 | Thread.Sleep(3000); // wait a little now that we're not waiting for the callback | ||
1754 | CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true); | ||
1755 | } | ||
1756 | |||
1749 | // SUCCESS! | 1757 | // SUCCESS! |
1750 | m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.ReceivedAtDestination); | 1758 | m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.ReceivedAtDestination); |
1751 | 1759 | ||
@@ -1768,13 +1776,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1768 | // agent.SendOtherAgentsAppearanceToMe(); | 1776 | // agent.SendOtherAgentsAppearanceToMe(); |
1769 | 1777 | ||
1770 | 1778 | ||
1771 | // Backwards compatibility. Best effort | ||
1772 | if (version == "Unknown" || version == string.Empty) | ||
1773 | { | ||
1774 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: neighbor with old version, passing attachments one by one..."); | ||
1775 | Thread.Sleep(3000); // wait a little now that we're not waiting for the callback | ||
1776 | CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true); | ||
1777 | } | ||
1778 | 1779 | ||
1779 | // Next, let's close the child agent connections that are too far away. | 1780 | // Next, let's close the child agent connections that are too far away. |
1780 | uint neighbourx; | 1781 | uint neighbourx; |