From 9bd2c1b88add5d6cc529a6882a7067200cb78ecb Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 14 Aug 2012 01:12:27 +0100
Subject: As per lindn spec, disable detach and drop for temp attachments

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

(limited to 'OpenSim/Region/CoreModules/Avatar/Attachments')

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 77dd0f0..f107be1 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -410,6 +410,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
             UUID inventoryID = so.FromItemID;
 
+            // As per Linden spec, drop is disabled for temp attachs
+            if (inventoryID == UUID.Zero)
+                return;
+
 //            m_log.DebugFormat(
 //                "[ATTACHMENTS MODULE]: In DetachSingleAttachmentToGround(), object is {0} {1}, associated item is {2}",
 //                so.Name, so.LocalId, inventoryID);
@@ -454,6 +458,10 @@ 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
-- 
cgit v1.1