From 2e43343ca9578fc8455a458f015957c3d6947e85 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Thu, 19 Nov 2015 14:45:39 +0000
Subject: ClearPartAttachmentData before adding object to scene, not after

---
 .../CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index e5373c3..b1de341 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -962,6 +962,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     {
                         part.CreateSelected = true;
                     }
+
+                    if (rootPart.Shape.PCode == (byte)PCode.Prim)
+                        group.ClearPartAttachmentData();
                 }
 
                 group.ResetIDs();
@@ -993,9 +996,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
                 if (!attachment)
                 {
-                    if (rootPart.Shape.PCode == (byte)PCode.Prim)
-                        group.ClearPartAttachmentData();
-
                     // Fire on_rez
                     group.CreateScriptInstances(0, true, m_Scene.DefaultScriptEngine, 1);
                     rootPart.ParentGroup.ResumeScripts();
-- 
cgit v1.1