Allow no-copy attachments to be worn without losing them

1 files changed, 7 insertions, 3 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 3d6a905..aa74e01 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -2194,8 +2194,6 @@ namespace OpenSim.Region.Environment.Scenes
                                 {
                                     group.ClearPartAttachmentData();
                                 }
-                                // Ghost prim if this is enabled!
-                                //group.ApplyPhysics(m_physicalPrim);
                             }
 
                             // Fire on_rez
@@ -2208,7 +2206,13 @@ namespace OpenSim.Region.Environment.Scenes
                             if (!Permissions.BypassPermissions())
                             {
                                 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
-                                    userInfo.DeleteItem(item.ID);
+                                {
+                                    // If this is done on attachments, no
+                                    // copy ones will be lost, so avoid it
+                                    //
+                                    if (!attachment)
+                                        userInfo.DeleteItem(item.ID);
+                                }
                             }
 
                             return rootPart.ParentGroup;