From 29530f30296271f2d5641091e45d5f396a7d4dec Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Tue, 19 Aug 2008 07:11:58 +0000
Subject: Attachment persistence!!! Patch #9170 (Mantis #1171) Attachments now
 persist across logouts. Mostly untested.

---
 OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 784d04c..e145f4a 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -2308,15 +2308,6 @@ namespace OpenSim.Region.Environment.Scenes
                 EventManager.TriggerStopScript(part.LocalId, itemID);
         }
 
-//        public void TestFunction()
-//        {
-//            IInventoryModule imod = RequestModuleInterface<IInventoryModule>();
-//            if (imod == null)
-//                return;
-//
-//            imod.TestFunction();
-//        }
-        
         public void RezSingleAttachment(IClientAPI remoteClient, LLUUID itemID,
                 uint AttachmentPt, uint ItemFlags, uint NextOwnerMask)
         {
@@ -2328,13 +2319,21 @@ namespace OpenSim.Region.Environment.Scenes
                 return;
             }
 
+            RezSingleAttachment(att, remoteClient, itemID, AttachmentPt,
+                    ItemFlags, NextOwnerMask);
+        }
+
+        public void RezSingleAttachment(SceneObjectGroup att,
+                IClientAPI remoteClient, LLUUID itemID, uint AttachmentPt,
+                uint ItemFlags, uint NextOwnerMask)
+        {
             if (att.RootPart != null)
                 AttachmentPt = att.RootPart.AttachmentPoint;
 
             ScenePresence presence;
             if(TryGetAvatar(remoteClient.AgentId, out presence))
             {
-                presence.Appearance.SetAttachment((int)AttachmentPt, itemID, att.GetFromAssetID());
+                presence.Appearance.SetAttachment((int)AttachmentPt, itemID, att.UUID);
                 IAvatarFactory ava = RequestModuleInterface<IAvatarFactory>();
                 if(ava != null)
                 {
-- 
cgit v1.1