Merge branch 'master' into careminster-presence-refactor

1 files changed, 43 insertions, 16 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 34198d2..e557d2c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Reflection;
 using System.Xml;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
@@ -41,38 +42,64 @@ using OpenSim.Region.Framework.Scenes.Serialization;
 
 namespace OpenSim.Region.CoreModules.Avatar.Attachments
 {
-    public class AttachmentsModule : IAttachmentsModule, IRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "AttachmentsModule")]
+    public class AttachmentsModule : IAttachmentsModule, INonSharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         protected Scene m_scene = null;
+        
+        public string Name { get { return "Attachments Module"; } }        
+        public Type ReplaceableInterface { get { return null; } }        
 
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(IConfigSource source) {}
+        
+        public void AddRegion(Scene scene)
         {
-            scene.RegisterModuleInterface<IAttachmentsModule>(this);
             m_scene = scene;
+            m_scene.RegisterModuleInterface<IAttachmentsModule>(this);
+            m_scene.EventManager.OnNewClient += SubscribeToClientEvents;
+            // TODO: Should probably be subscribing to CloseClient too, but this doesn't yet give us IClientAPI
         }
-
-        public void PostInitialise()
+        
+        public void RemoveRegion(Scene scene) 
         {
+            m_scene.UnregisterModuleInterface<IAttachmentsModule>(this);
+            m_scene.EventManager.OnNewClient -= SubscribeToClientEvents;
         }
-
-        public void Close()
+        
+        public void RegionLoaded(Scene scene) {}
+        
+        public void Close() 
         {
+            RemoveRegion(m_scene);
         }
-
-        public string Name
+        
+        public void SubscribeToClientEvents(IClientAPI client)
         {
-            get { return "Attachments Module"; }
+            client.OnRezSingleAttachmentFromInv += RezSingleAttachmentFromInventory;
+            client.OnRezMultipleAttachmentsFromInv += RezMultipleAttachmentsFromInventory;
+            client.OnObjectAttach += AttachObject;
+            client.OnObjectDetach += DetachObject;
+            client.OnDetachAttachmentIntoInv += ShowDetachInUserInventory;             
         }
-
-        public bool IsSharedModule
+        
+        public void UnsubscribeFromClientEvents(IClientAPI client)
         {
-            get { return false; }
+            client.OnRezSingleAttachmentFromInv -= RezSingleAttachmentFromInventory;
+            client.OnRezMultipleAttachmentsFromInv -= RezMultipleAttachmentsFromInventory;
+            client.OnObjectAttach -= AttachObject;
+            client.OnObjectDetach -= DetachObject;
+            client.OnDetachAttachmentIntoInv -= ShowDetachInUserInventory;       
         }
-
-        // Called by client
-        //
+        
+        /// <summary>
+        /// Called by client
+        /// </summary>
+        /// <param name="remoteClient"></param>
+        /// <param name="objectLocalID"></param>
+        /// <param name="AttachmentPt"></param>
+        /// <param name="silent"></param>
         public void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent)
         {
             m_log.Debug("[ATTACHMENTS MODULE]: Invoking AttachObject");