ClearPartAttachmentData before adding object to scene, not after

1 files 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();