1 files changed, 7 insertions, 22 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 6bbbd56..35c59aa 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -28,7 +28,6 @@
 using System;
 using System.Reflection;
 using log4net;
-using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -39,8 +38,7 @@ using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class AvatarFactoryModule : IAvatarFactory, ISharedRegionModule
+    public class AvatarFactoryModule : IAvatarFactory, IRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private Scene m_scene = null;
@@ -77,16 +75,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             return appearance;
         }
 
-        public void Initialise(IConfigSource source)
-        {
-        }
-
-        public Type ReplaceableInterface
-        {
-            get { return null; }
-        }
-
-        public void AddRegion(Scene scene)
+        public void Initialise(Scene scene, IConfigSource source)
         {
             scene.RegisterModuleInterface<IAvatarFactory>(this);
             scene.EventManager.OnNewClient += NewClient;
@@ -95,18 +84,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             {
                 m_scene = scene;
             }
-        }
 
-        public void RegionLoaded(Scene scene)
-        {
         }
 
-        public void RemoveRegion(Scene scene)
-        {
-            scene.UnregisterModuleInterface<IAvatarFactory>(this);
-            scene.EventManager.OnNewClient -= NewClient;
-        }
-        
         public void PostInitialise()
         {
         }
@@ -120,6 +100,11 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             get { return "Default Avatar Factory"; }
         }
 
+        public bool IsSharedModule
+        {
+            get { return false; }
+        }
+
         public void NewClient(IClientAPI client)
         {
             client.OnAvatarNowWearing += AvatarIsWearing;