test not rezzing attachments on a FireAndForget

1 files changed, 13 insertions, 14 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 4faad98..e1d0fb4 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1854,24 +1854,15 @@ namespace OpenSim.Region.Framework.Scenes
                 // send what we have to us, even if not in cache ( bad? )
                 ValidateAndSendAppearanceAndAgentData();
 
-                // Create child agents in neighbouring regions
-                if (openChildAgents && !IsChildAgent)
-                {
-                    IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
-                    if (m_agentTransfer != null)
-                        m_agentTransfer.EnableChildAgents(this);
-                }
-
-
                 // attachments
                 if (isNPC || (TeleportFlags & TeleportFlags.ViaLogin) != 0)
                 {
-                    if (Scene.AttachmentsModule != null)
-                        Util.FireAndForget(
-                            o =>
-                            {
+//                    if (Scene.AttachmentsModule != null)
+//                        Util.FireAndForget(
+//                            o =>
+//                            {
                                 Scene.AttachmentsModule.RezAttachments(this);
-                            });
+//                            });
                 }
                 else
                 {
@@ -1895,6 +1886,14 @@ namespace OpenSim.Region.Framework.Scenes
                 //                "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", 
                 //                client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds);
 
+                // Create child agents in neighbouring regions
+                if (openChildAgents && !IsChildAgent)
+                {
+                    IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
+                    if (m_agentTransfer != null)
+                        m_agentTransfer.EnableChildAgents(this);
+                }
+
                 // send the rest of the world
                 if (m_teleportFlags > 0 && !isNPC)
                     SendInitialDataToMe();