3 files changed, 26 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 4b3e45f..086496e 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -298,6 +298,13 @@ namespace OpenSim.Region.Framework.Scenes
         public delegate void EmptyScriptCompileQueue(int numScriptsFailed, string message);
         public event EmptyScriptCompileQueue OnEmptyScriptCompileQueue;
 
+        /// <summary>
+        /// Called whenever an object is attached, or detached
+        /// from an in-world presence.
+        /// </summary>
+        public delegate void Attach(uint localID, UUID itemID, UUID avatarID);
+        public event Attach OnAttach;
+
         public class MoneyTransferArgs : EventArgs
         {
             public UUID sender;
@@ -438,6 +445,15 @@ namespace OpenSim.Region.Framework.Scenes
         
         private EmptyScriptCompileQueue handlerEmptyScriptCompileQueue = null;
 
+        private Attach handlerOnAttach = null;
+
+        public void TriggerOnAttach(uint localID, UUID itemID, UUID avatarID)
+        {
+            handlerOnAttach = OnAttach;
+            if (handlerOnAttach != null)
+                handlerOnAttach(localID, itemID, avatarID);
+        }
+
         public void TriggerGetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID)
         {
             handlerGetScriptRunning = OnGetScriptRunning;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 15009a3..facd301 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2574,6 +2574,11 @@ namespace OpenSim.Region.Framework.Scenes
                 EventManager.TriggerStopScript(part.LocalId, itemID);
         }
 
+        internal void SendAttachEvent(uint localID, UUID itemID, UUID avatarID)
+        {
+            EventManager.TriggerOnAttach(localID, itemID, avatarID);
+        }
+
         public UUID RezSingleAttachment(IClientAPI remoteClient, UUID itemID,
                 uint AttachmentPt)
         {
@@ -2684,6 +2689,7 @@ namespace OpenSim.Region.Framework.Scenes
                     remoteClient.SendRemoveInventoryItem(inventoryID);
                 }
             }
+            SendAttachEvent(part.ParentGroup.LocalId, itemID, UUID.Zero);
         }
 
         public void DetachSingleAttachmentToInv(UUID itemID, IClientAPI remoteClient)
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 3f63481..0e0999a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -489,6 +489,7 @@ namespace OpenSim.Region.Framework.Scenes
             // Calls attach with a Zero position
             //
             AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, Vector3.Zero, false);
+            m_parentScene.SendAttachEvent(objectLocalID, part.ParentGroup.GetFromAssetID(), remoteClient.AgentId);
         }
 
         public SceneObjectGroup RezSingleAttachment(
@@ -511,8 +512,8 @@ namespace OpenSim.Region.Framework.Scenes
                     objatt.HasGroupChanged = true;
 
                 // Fire after attach, so we don't get messy perms dialogs
-                //
-                objatt.CreateScriptInstances(0, true, m_parentScene.DefaultScriptEngine, 0);
+                // 3 == AttachedRez
+                objatt.CreateScriptInstances(0, true, m_parentScene.DefaultScriptEngine, 3);
             }
             return objatt;
         }
@@ -537,6 +538,7 @@ namespace OpenSim.Region.Framework.Scenes
                     group = (SceneObjectGroup)entity;
                     if (group.GetFromAssetID() == itemID)
                     {
+                        m_parentScene.SendAttachEvent(group.LocalId, itemID, UUID.Zero);
                         group.DetachToInventoryPrep();
                         m_log.Debug("[DETACH]: Saving attachpoint: " +
                                 ((uint)group.GetAttachmentPoint()).ToString());