From 1cad124b7d99c4c0e8f01210a14cd2604c92a1d1 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 5 Dec 2008 04:17:21 +0000
Subject: Allow no-copy attachments to be worn without losing them

---
 OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 10 +++++++---
 1 file 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;
-- 
cgit v1.1