From 71f42f185a48ef96391b39fa0197c1a8b793e969 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sat, 24 Apr 2010 16:45:25 +0200
Subject: Plumb a data path to initialize an attachment from an alternate
 source

---
 OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | 7 ++++++-
 OpenSim/Region/Framework/Scenes/ScenePresence.cs          | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
index f8af367..958847b 100644
--- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.Xml;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
 using OpenSim.Framework;
@@ -82,6 +83,10 @@ namespace OpenSim.Region.Framework.Interfaces
         UUID RezSingleAttachmentFromInventory(
             IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus);
 
+        // Same as above, but also load script states from a separate doc
+        UUID RezSingleAttachmentFromInventory(
+            IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus, XmlDocument doc);
+
         /// <summary>
         /// Rez multiple attachments from a user's inventory
         /// </summary>
@@ -132,4 +137,4 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </param>
         void ShowDetachInUserInventory(UUID itemID, IClientAPI remoteClient);
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index c220bf0..a5c0b0d 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3984,7 +3984,7 @@ Console.WriteLine("Scripted Sit ofset {0}", m_pos);
                 {
                     // Rez from inventory
                     UUID asset 
-                        = m_scene.AttachmentsModule.RezSingleAttachmentFromInventory(ControllingClient, itemID, (uint)p);
+                        = m_scene.AttachmentsModule.RezSingleAttachmentFromInventory(ControllingClient, itemID, (uint)p, true, null);
 
                     m_log.InfoFormat(
                         "[ATTACHMENT]: Rezzed attachment in point {0} from item {1} and asset {2} ({3})",
-- 
cgit v1.1