From f71ed7eb79091de370800362f716d214dd27b03a Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 20 Aug 2012 15:35:06 +0200
Subject: Fix scripted detach of temp attachments

---
 .../Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs    | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 88ca9db..951afd7 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -526,10 +526,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
         public void DetachSingleAttachmentToInv(IScenePresence sp, SceneObjectGroup so)
         {
-            // As per Linden spec, detach (take) is disabled for temp attachs
-            if (so.FromItemID == UUID.Zero)
-                return;
-
             lock (sp.AttachmentsSyncLock)
             {
                 // Save avatar attachment information
@@ -1050,7 +1046,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             ScenePresence sp = m_scene.GetScenePresence(remoteClient.AgentId);
             SceneObjectGroup group = m_scene.GetGroupByPrim(objectLocalID);
 
-            if (sp != null && group != null)
+            if (sp != null && group != null && group.FromItemID != UUID.Zero)
                 DetachSingleAttachmentToInv(sp, group);
         }
 
@@ -1068,7 +1064,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
     
                     foreach (SceneObjectGroup group in attachments)
                     {
-                        if (group.FromItemID == itemID)
+                        if (group.FromItemID == itemID && group.FromItemID != UUID.Zero)
                         {
                             DetachSingleAttachmentToInv(sp, group);
                             return;
-- 
cgit v1.1