From 3e6f49f3be27f5918c4d6322c1882b8267bd4855 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Fri, 15 Aug 2014 19:21:32 +0100
Subject: do CrossAttachmentsIntoNewRegion for old versions in the right place

---
 .../Framework/EntityTransfer/EntityTransferModule.cs      | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region')

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
                                             capsPath);
             }
 
+            // Backwards compatibility. Best effort
+            if (version == "Unknown" || version == string.Empty)
+            {
+                m_log.DebugFormat("[ENTITY TRANSFER MODULE]: neighbor with old version, passing attachments one by one...");
+                Thread.Sleep(3000); // wait a little now that we're not waiting for the callback
+                CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true);
+            }
+
             // SUCCESS!
             m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.ReceivedAtDestination);
 
@@ -1768,13 +1776,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 //            agent.SendOtherAgentsAppearanceToMe();
 
 
-            // Backwards compatibility. Best effort
-            if (version == "Unknown" || version == string.Empty)
-            {
-                m_log.DebugFormat("[ENTITY TRANSFER MODULE]: neighbor with old version, passing attachments one by one...");
-                Thread.Sleep(3000); // wait a little now that we're not waiting for the callback
-                CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true);
-            }
 
             // Next, let's close the child agent connections that are too far away.
             uint neighbourx;
-- 
cgit v1.1