diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 29 |
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 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Reflection; | 29 | using System.Reflection; |
30 | using log4net; | 30 | using log4net; |
31 | using Mono.Addins; | ||
32 | using Nini.Config; | 31 | using Nini.Config; |
33 | using OpenMetaverse; | 32 | using OpenMetaverse; |
34 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
@@ -39,8 +38,7 @@ using OpenSim.Services.Interfaces; | |||
39 | 38 | ||
40 | namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | 39 | namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory |
41 | { | 40 | { |
42 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 41 | public class AvatarFactoryModule : IAvatarFactory, IRegionModule |
43 | public class AvatarFactoryModule : IAvatarFactory, ISharedRegionModule | ||
44 | { | 42 | { |
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | private Scene m_scene = null; | 44 | private Scene m_scene = null; |
@@ -77,16 +75,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
77 | return appearance; | 75 | return appearance; |
78 | } | 76 | } |
79 | 77 | ||
80 | public void Initialise(IConfigSource source) | 78 | public void Initialise(Scene scene, IConfigSource source) |
81 | { | ||
82 | } | ||
83 | |||
84 | public Type ReplaceableInterface | ||
85 | { | ||
86 | get { return null; } | ||
87 | } | ||
88 | |||
89 | public void AddRegion(Scene scene) | ||
90 | { | 79 | { |
91 | scene.RegisterModuleInterface<IAvatarFactory>(this); | 80 | scene.RegisterModuleInterface<IAvatarFactory>(this); |
92 | scene.EventManager.OnNewClient += NewClient; | 81 | scene.EventManager.OnNewClient += NewClient; |
@@ -95,18 +84,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
95 | { | 84 | { |
96 | m_scene = scene; | 85 | m_scene = scene; |
97 | } | 86 | } |
98 | } | ||
99 | 87 | ||
100 | public void RegionLoaded(Scene scene) | ||
101 | { | ||
102 | } | 88 | } |
103 | 89 | ||
104 | public void RemoveRegion(Scene scene) | ||
105 | { | ||
106 | scene.UnregisterModuleInterface<IAvatarFactory>(this); | ||
107 | scene.EventManager.OnNewClient -= NewClient; | ||
108 | } | ||
109 | |||
110 | public void PostInitialise() | 90 | public void PostInitialise() |
111 | { | 91 | { |
112 | } | 92 | } |
@@ -120,6 +100,11 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
120 | get { return "Default Avatar Factory"; } | 100 | get { return "Default Avatar Factory"; } |
121 | } | 101 | } |
122 | 102 | ||
103 | public bool IsSharedModule | ||
104 | { | ||
105 | get { return false; } | ||
106 | } | ||
107 | |||
123 | public void NewClient(IClientAPI client) | 108 | public void NewClient(IClientAPI client) |
124 | { | 109 | { |
125 | client.OnAvatarNowWearing += AvatarIsWearing; | 110 | client.OnAvatarNowWearing += AvatarIsWearing; |