diff options
author | Melanie | 2010-01-29 07:20:13 +0000 |
---|---|---|
committer | Melanie | 2010-01-29 07:21:06 +0000 |
commit | a87a247f0548d39a8c39b1d28123d7da8db44598 (patch) | |
tree | 7f9f77c38a224bc6d4bea7ccced1d4710c8a91b1 /OpenSim/Region/CoreModules/Avatar/Profiles | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-a87a247f0548d39a8c39b1d28123d7da8db44598.zip opensim-SC_OLD-a87a247f0548d39a8c39b1d28123d7da8db44598.tar.gz opensim-SC_OLD-a87a247f0548d39a8c39b1d28123d7da8db44598.tar.bz2 opensim-SC_OLD-a87a247f0548d39a8c39b1d28123d7da8db44598.tar.xz |
Revert "Updates all IRegionModules to the new style region modules."
This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Profiles')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs index 7fcb0e1..8cf58c6 100644 --- a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs | |||
@@ -30,7 +30,6 @@ using System.Collections; | |||
30 | using System.Globalization; | 30 | using System.Globalization; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using log4net; | 32 | using log4net; |
33 | using Mono.Addins; | ||
34 | using Nini.Config; | 33 | using Nini.Config; |
35 | using OpenMetaverse; | 34 | using OpenMetaverse; |
36 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
@@ -39,17 +38,20 @@ using OpenSim.Region.Framework.Scenes; | |||
39 | 38 | ||
40 | namespace OpenSim.Region.CoreModules.Avatar.Profiles | 39 | namespace OpenSim.Region.CoreModules.Avatar.Profiles |
41 | { | 40 | { |
42 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 41 | public class AvatarProfilesModule : IRegionModule |
43 | public class AvatarProfilesModule : INonSharedRegionModule | ||
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; | 44 | private Scene m_scene; |
47 | private IProfileModule m_profileModule = null; | 45 | private IProfileModule m_profileModule = null; |
48 | private bool m_enabled = true; | 46 | private bool m_enabled = true; |
49 | 47 | ||
50 | #region INonSharedRegionModule Members | 48 | public AvatarProfilesModule() |
49 | { | ||
50 | } | ||
51 | 51 | ||
52 | public void Initialise(IConfigSource config) | 52 | #region IRegionModule Members |
53 | |||
54 | public void Initialise(Scene scene, IConfigSource config) | ||
53 | { | 55 | { |
54 | IConfig profileConfig = config.Configs["Profile"]; | 56 | IConfig profileConfig = config.Configs["Profile"]; |
55 | if (profileConfig != null) | 57 | if (profileConfig != null) |
@@ -60,31 +62,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles | |||
60 | return; | 62 | return; |
61 | } | 63 | } |
62 | } | 64 | } |
63 | } | ||
64 | |||
65 | public Type ReplaceableInterface | ||
66 | { | ||
67 | get { return null; } | ||
68 | } | ||
69 | 65 | ||
70 | public void AddRegion(Scene scene) | ||
71 | { | ||
72 | m_scene = scene; | 66 | m_scene = scene; |
73 | m_scene.EventManager.OnNewClient += NewClient; | 67 | m_scene.EventManager.OnNewClient += NewClient; |
74 | } | 68 | } |
75 | 69 | ||
76 | public void RegionLoaded(Scene scene) | 70 | public void PostInitialise() |
77 | { | 71 | { |
78 | if (!m_enabled) | 72 | if (!m_enabled) |
79 | return; | 73 | return; |
80 | m_profileModule = m_scene.RequestModuleInterface<IProfileModule>(); | 74 | m_profileModule = m_scene.RequestModuleInterface<IProfileModule>(); |
81 | } | 75 | } |
82 | 76 | ||
83 | public void RemoveRegion(Scene scene) | ||
84 | { | ||
85 | scene.EventManager.OnNewClient -= NewClient; | ||
86 | } | ||
87 | |||
88 | public void Close() | 77 | public void Close() |
89 | { | 78 | { |
90 | } | 79 | } |
@@ -94,6 +83,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles | |||
94 | get { return "AvatarProfilesModule"; } | 83 | get { return "AvatarProfilesModule"; } |
95 | } | 84 | } |
96 | 85 | ||
86 | public bool IsSharedModule | ||
87 | { | ||
88 | get { return false; } | ||
89 | } | ||
90 | |||
97 | #endregion | 91 | #endregion |
98 | 92 | ||
99 | public void NewClient(IClientAPI client) | 93 | public void NewClient(IClientAPI client) |