1 files changed, 19 insertions, 13 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
index 8cf58c6..7fcb0e1 100644
--- a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
@@ -30,6 +30,7 @@ using System.Collections;
 using System.Globalization;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -38,20 +39,17 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Avatar.Profiles
 {
-    public class AvatarProfilesModule : IRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class AvatarProfilesModule : INonSharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private Scene m_scene;
         private IProfileModule m_profileModule = null;
         private bool m_enabled = true;
 
-        public AvatarProfilesModule()
-        {
-        }
+        #region INonSharedRegionModule Members
 
-        #region IRegionModule Members
-
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
         {
             IConfig profileConfig = config.Configs["Profile"];
             if (profileConfig != null)
@@ -62,30 +60,38 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles
                     return;
                 }
             }
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
 
+        public void AddRegion(Scene scene)
+        {
             m_scene = scene;
             m_scene.EventManager.OnNewClient += NewClient;
         }
 
-        public void PostInitialise()
+        public void RegionLoaded(Scene scene)
         {
             if (!m_enabled)
                 return;
             m_profileModule = m_scene.RequestModuleInterface<IProfileModule>();
         }
 
-        public void Close()
+        public void RemoveRegion(Scene scene)
         {
+            scene.EventManager.OnNewClient -= NewClient;
         }
 
-        public string Name
+        public void Close()
         {
-            get { return "AvatarProfilesModule"; }
         }
 
-        public bool IsSharedModule
+        public string Name
         {
-            get { return false; }
+            get { return "AvatarProfilesModule"; }
         }
 
         #endregion