1 files changed, 12 insertions, 0 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 7380b63..3d90fa6 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -775,6 +775,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 return;
             }
 
+            // If this didn't come from inventory, it also shouldn't go there
+            // on detach. It's likely a temp attachment.
+            if (so.FromItemID != UUID.Zero)
+            {
+                sp.RemoveAttachment(so);
+                m_scene.DeleteSceneObject(so, false, false);
+                so.RemoveScriptInstances(true);
+                so.Clear();
+
+                return;
+            }
+
             if (DebugLevel > 0)
                 m_log.DebugFormat(
                     "[ATTACHMENTS MODULE]: Detaching object {0} {1} (FromItemID {2}) for {3} in {4}",