diff options
author | Adam Frisby | 2008-05-01 18:04:42 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-01 18:04:42 +0000 |
commit | 20a9bf08f51351e1e0a9de94f184ff56cd572665 (patch) | |
tree | 52da64dab26353b903c8e4befed0178fa72a188b /OpenSim/Region/Environment/ModuleLoader.cs | |
parent | More config cleanup in LaunchSLClient. (diff) | |
download | opensim-SC-20a9bf08f51351e1e0a9de94f184ff56cd572665.zip opensim-SC-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.gz opensim-SC-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.bz2 opensim-SC-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.xz |
* Rolled back a few changes.
Diffstat (limited to 'OpenSim/Region/Environment/ModuleLoader.cs')
-rw-r--r-- | OpenSim/Region/Environment/ModuleLoader.cs | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/OpenSim/Region/Environment/ModuleLoader.cs b/OpenSim/Region/Environment/ModuleLoader.cs index caaa28f..3f8b9ff 100644 --- a/OpenSim/Region/Environment/ModuleLoader.cs +++ b/OpenSim/Region/Environment/ModuleLoader.cs | |||
@@ -47,11 +47,12 @@ namespace OpenSim.Region.Environment | |||
47 | public class ModuleLoader | 47 | public class ModuleLoader |
48 | { | 48 | { |
49 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 49 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
50 | private readonly IConfigSource m_config; | 50 | |
51 | public Dictionary<string, Assembly> LoadedAssemblys = new Dictionary<string, Assembly>(); | ||
51 | 52 | ||
52 | private readonly List<IRegionModule> m_loadedModules = new List<IRegionModule>(); | 53 | private readonly List<IRegionModule> m_loadedModules = new List<IRegionModule>(); |
53 | private readonly Dictionary<string, IRegionModule> m_loadedSharedModules = new Dictionary<string, IRegionModule>(); | 54 | private readonly Dictionary<string, IRegionModule> m_loadedSharedModules = new Dictionary<string, IRegionModule>(); |
54 | public Dictionary<string, Assembly> LoadedAssemblys = new Dictionary<string, Assembly>(); | 55 | private readonly IConfigSource m_config; |
55 | 56 | ||
56 | public ModuleLoader(IConfigSource config) | 57 | public ModuleLoader(IConfigSource config) |
57 | { | 58 | { |
@@ -85,8 +86,7 @@ namespace OpenSim.Region.Environment | |||
85 | DynamicTextureModule dynamicModule = new DynamicTextureModule(); | 86 | DynamicTextureModule dynamicModule = new DynamicTextureModule(); |
86 | if (m_loadedSharedModules.ContainsKey(dynamicModule.Name)) | 87 | if (m_loadedSharedModules.ContainsKey(dynamicModule.Name)) |
87 | { | 88 | { |
88 | m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", dynamicModule.Name, | 89 | m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", dynamicModule.Name, "DynamicTextureModule"); |
89 | "DynamicTextureModule"); | ||
90 | } | 90 | } |
91 | else | 91 | else |
92 | { | 92 | { |
@@ -123,15 +123,15 @@ namespace OpenSim.Region.Environment | |||
123 | m_loadedSharedModules.Add(loadMod.Name, loadMod); | 123 | m_loadedSharedModules.Add(loadMod.Name, loadMod); |
124 | } | 124 | } |
125 | 125 | ||
126 | // AvatarFactoryModule avatarFactory = new AvatarFactoryModule(); | 126 | // AvatarFactoryModule avatarFactory = new AvatarFactoryModule(); |
127 | // if (m_loadedSharedModules.ContainsKey(avatarFactory.Name)) | 127 | // if (m_loadedSharedModules.ContainsKey(avatarFactory.Name)) |
128 | // { | 128 | // { |
129 | // m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", avatarFactory.Name, "AvarFactoryModule"); | 129 | // m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", avatarFactory.Name, "AvarFactoryModule"); |
130 | // } | 130 | // } |
131 | // else | 131 | // else |
132 | // { | 132 | // { |
133 | // m_loadedSharedModules.Add(avatarFactory.Name, avatarFactory); | 133 | // m_loadedSharedModules.Add(avatarFactory.Name, avatarFactory); |
134 | // } | 134 | // } |
135 | 135 | ||
136 | XMLRPCModule xmlRpcMod = new XMLRPCModule(); | 136 | XMLRPCModule xmlRpcMod = new XMLRPCModule(); |
137 | if (m_loadedSharedModules.ContainsKey(xmlRpcMod.Name)) | 137 | if (m_loadedSharedModules.ContainsKey(xmlRpcMod.Name)) |
@@ -149,13 +149,13 @@ namespace OpenSim.Region.Environment | |||
149 | AssetTransactionModule transactionsModule = new AssetTransactionModule(); | 149 | AssetTransactionModule transactionsModule = new AssetTransactionModule(); |
150 | if (m_loadedSharedModules.ContainsKey(transactionsModule.Name)) | 150 | if (m_loadedSharedModules.ContainsKey(transactionsModule.Name)) |
151 | { | 151 | { |
152 | m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", transactionsModule.Name, | 152 | m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", transactionsModule.Name, "TransactionModule"); |
153 | "TransactionModule"); | ||
154 | } | 153 | } |
155 | else | 154 | else |
156 | { | 155 | { |
157 | m_loadedSharedModules.Add(transactionsModule.Name, transactionsModule); | 156 | m_loadedSharedModules.Add(transactionsModule.Name, transactionsModule); |
158 | } | 157 | } |
158 | |||
159 | } | 159 | } |
160 | 160 | ||
161 | public void InitialiseSharedModules(Scene scene) | 161 | public void InitialiseSharedModules(Scene scene) |
@@ -284,7 +284,7 @@ namespace OpenSim.Region.Environment | |||
284 | { | 284 | { |
285 | if (pluginType.GetInterface("IRegionModule") != null) | 285 | if (pluginType.GetInterface("IRegionModule") != null) |
286 | { | 286 | { |
287 | modules.Add((IRegionModule) Activator.CreateInstance(pluginType)); | 287 | modules.Add((IRegionModule)Activator.CreateInstance(pluginType)); |
288 | } | 288 | } |
289 | } | 289 | } |
290 | } | 290 | } |
@@ -320,8 +320,8 @@ namespace OpenSim.Region.Environment | |||
320 | public void UnloadModule(IRegionModule rm) | 320 | public void UnloadModule(IRegionModule rm) |
321 | { | 321 | { |
322 | rm.Close(); | 322 | rm.Close(); |
323 | 323 | ||
324 | m_loadedModules.Remove(rm); | 324 | m_loadedModules.Remove(rm); |
325 | } | 325 | } |
326 | } | 326 | } |
327 | } \ No newline at end of file | 327 | } |