diff options
author | Melanie | 2009-12-25 23:10:07 +0000 |
---|---|---|
committer | Melanie | 2009-12-25 23:10:07 +0000 |
commit | 8d36d7beed0f5bc932407671596d5a79ff8f8eb6 (patch) | |
tree | 11b838ac5eaf071468f573c3768b8a4e90df1fe3 /OpenSim/Region/CoreModules/Avatar/Profiles | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-8d36d7beed0f5bc932407671596d5a79ff8f8eb6.zip opensim-SC_OLD-8d36d7beed0f5bc932407671596d5a79ff8f8eb6.tar.gz opensim-SC_OLD-8d36d7beed0f5bc932407671596d5a79ff8f8eb6.tar.bz2 opensim-SC_OLD-8d36d7beed0f5bc932407671596d5a79ff8f8eb6.tar.xz |
Enable the profile module to be replaced completely, even for the base
profile data
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Profiles')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs index 0f58788..8cf58c6 100644 --- a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs | |||
@@ -43,6 +43,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles | |||
43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
44 | private Scene m_scene; | 44 | private Scene m_scene; |
45 | private IProfileModule m_profileModule = null; | 45 | private IProfileModule m_profileModule = null; |
46 | private bool m_enabled = true; | ||
46 | 47 | ||
47 | public AvatarProfilesModule() | 48 | public AvatarProfilesModule() |
48 | { | 49 | { |
@@ -52,12 +53,24 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles | |||
52 | 53 | ||
53 | public void Initialise(Scene scene, IConfigSource config) | 54 | public void Initialise(Scene scene, IConfigSource config) |
54 | { | 55 | { |
56 | IConfig profileConfig = config.Configs["Profile"]; | ||
57 | if (profileConfig != null) | ||
58 | { | ||
59 | if (profileConfig.GetString("Module", Name) != Name) | ||
60 | { | ||
61 | m_enabled = false; | ||
62 | return; | ||
63 | } | ||
64 | } | ||
65 | |||
55 | m_scene = scene; | 66 | m_scene = scene; |
56 | m_scene.EventManager.OnNewClient += NewClient; | 67 | m_scene.EventManager.OnNewClient += NewClient; |
57 | } | 68 | } |
58 | 69 | ||
59 | public void PostInitialise() | 70 | public void PostInitialise() |
60 | { | 71 | { |
72 | if (!m_enabled) | ||
73 | return; | ||
61 | m_profileModule = m_scene.RequestModuleInterface<IProfileModule>(); | 74 | m_profileModule = m_scene.RequestModuleInterface<IProfileModule>(); |
62 | } | 75 | } |
63 | 76 | ||