From 1f3ce48be110ad048784aef22ee8458466d3fe06 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 23 Aug 2011 00:04:38 +0100
Subject: If an object failed to attach due to an exception, then try and
 detach it from the avatar's list of attachments as well as delete it from the
 scene.

This may help with the "Inconsistent attachment state" errors seen on teleport.
See http://opensimulator.org/mantis/view.php?id=5644 and linked reports
---
 OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index c96de3a..90092ce 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -316,6 +316,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                             objatt.Name, objatt.UUID, sp.Name, e.Message, e.StackTrace);
 
                         // Make sure the object doesn't stick around and bail
+                        sp.RemoveAttachment(objatt);
                         m_scene.DeleteSceneObject(objatt, false);
                         return null;
                     }
@@ -433,7 +434,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 if (changed && m_scene.AvatarFactory != null)
                     m_scene.AvatarFactory.QueueAppearanceSave(remoteClient.AgentId);
 
-                DetachSingleAttachmentToInv(itemID, presence);                
+                DetachSingleAttachmentToInv(itemID, presence);
             }
         }
 
-- 
cgit v1.1