From e7a515bab0e46c228f8f543397f97b7ba2f0df3c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 30 Aug 2011 22:06:24 +0100
Subject: Fix bug where attachments were remaining on the avatar after being
 dropped.

If the inventory service is configured not to allow deletion then these will not disappear from inventory
---
 .../Avatar/Attachments/Tests/AttachmentsModuleTests.cs     | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

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

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index bb53601..b1f9197 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -138,7 +138,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             m_attMod.RezSingleAttachmentFromInventory(
                 m_presence.ControllingClient, attItemId, (uint)AttachmentPoint.Chest);
 
-            // Check status on scene presence
+            // Check scene presence status
             Assert.That(m_presence.HasAttachments(), Is.True);
             List<SceneObjectGroup> attachments = m_presence.Attachments;
             Assert.That(attachments.Count, Is.EqualTo(1));
@@ -149,12 +149,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             Assert.That(attSo.UsesPhysics, Is.False);
             Assert.That(attSo.IsTemporary, Is.False);
 
-            // Check item status
+            // Check appearance status
             Assert.That(m_presence.Appearance.GetAttachpoint(attItemId), Is.EqualTo((int)AttachmentPoint.Chest));
         }
 
         [Test]
-        public void TestDetachAttachmentToScene()
+        public void TestDetachAttachmentToGround()
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
@@ -168,15 +168,21 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             UserInventoryHelpers.CreateInventoryItem(
                 scene, attName, attItemId, attAssetId, m_presence.UUID, InventoryType.Object);
 
+// Check item status
+            Assert.That(scene.InventoryService.GetItem(new InventoryItemBase(attItemId)), Is.Not.Null);
+
             UUID attSoId = m_attMod.RezSingleAttachmentFromInventory(
                 m_presence.ControllingClient, attItemId, (uint)AttachmentPoint.Chest);
             m_attMod.DetachSingleAttachmentToGround(attSoId, m_presence.ControllingClient);
 
-            // Check status on scene presence
+            // Check scene presence status
             Assert.That(m_presence.HasAttachments(), Is.False);
             List<SceneObjectGroup> attachments = m_presence.Attachments;
             Assert.That(attachments.Count, Is.EqualTo(0));
 
+            // Check appearance status
+            Assert.That(m_presence.Appearance.GetAttachments().Count, Is.EqualTo(0));
+
             // Check item status
             Assert.That(scene.InventoryService.GetItem(new InventoryItemBase(attItemId)), Is.Null);
 
-- 
cgit v1.1