ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Rolled back a few changes.

Browse Source
This commit is contained in:
Adam Frisby
2008-05-01 18:04:42 +00:00
parent 138e612300
commit 20a9bf08f5
117 changed files with 5079 additions and 4982 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
OpenSim/Region/Environment/ModuleLoader.cs
View File

@@ -47,11 +47,12 @@ namespace OpenSim.Region.Environment
public class ModuleLoader
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private readonly IConfigSource m_config;
public Dictionary<string, Assembly> LoadedAssemblys = new Dictionary<string, Assembly>();
private readonly List<IRegionModule> m_loadedModules = new List<IRegionModule>();
private readonly Dictionary<string, IRegionModule> m_loadedSharedModules = new Dictionary<string, IRegionModule>();
public Dictionary<string, Assembly> LoadedAssemblys = new Dictionary<string, Assembly>();
private readonly IConfigSource m_config;
public ModuleLoader(IConfigSource config)
{
@@ -85,8 +86,7 @@ namespace OpenSim.Region.Environment
DynamicTextureModule dynamicModule = new DynamicTextureModule();
if (m_loadedSharedModules.ContainsKey(dynamicModule.Name))
{
m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", dynamicModule.Name,
"DynamicTextureModule");
m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", dynamicModule.Name, "DynamicTextureModule");
}
else
{
@@ -123,15 +123,15 @@ namespace OpenSim.Region.Environment
m_loadedSharedModules.Add(loadMod.Name, loadMod);
}
// AvatarFactoryModule avatarFactory = new AvatarFactoryModule();
// if (m_loadedSharedModules.ContainsKey(avatarFactory.Name))
// {
// m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", avatarFactory.Name, "AvarFactoryModule");
// }
// else
// {
// m_loadedSharedModules.Add(avatarFactory.Name, avatarFactory);
// }
// AvatarFactoryModule avatarFactory = new AvatarFactoryModule();
// if (m_loadedSharedModules.ContainsKey(avatarFactory.Name))
// {
// m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", avatarFactory.Name, "AvarFactoryModule");
// }
// else
// {
// m_loadedSharedModules.Add(avatarFactory.Name, avatarFactory);
// }
XMLRPCModule xmlRpcMod = new XMLRPCModule();
if (m_loadedSharedModules.ContainsKey(xmlRpcMod.Name))
@@ -149,13 +149,13 @@ namespace OpenSim.Region.Environment
AssetTransactionModule transactionsModule = new AssetTransactionModule();
if (m_loadedSharedModules.ContainsKey(transactionsModule.Name))
{
m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", transactionsModule.Name,
"TransactionModule");
m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", transactionsModule.Name, "TransactionModule");
}
else
{
m_loadedSharedModules.Add(transactionsModule.Name, transactionsModule);
}
}
public void InitialiseSharedModules(Scene scene)
@@ -284,7 +284,7 @@ namespace OpenSim.Region.Environment
{
if (pluginType.GetInterface("IRegionModule") != null)
{
modules.Add((IRegionModule) Activator.CreateInstance(pluginType));
modules.Add((IRegionModule)Activator.CreateInstance(pluginType));
}
}
}
@@ -320,8 +320,8 @@ namespace OpenSim.Region.Environment
public void UnloadModule(IRegionModule rm)
{
rm.Close();
m_loadedModules.Remove(rm);
}
}
}
}