OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

*Shared Modules have feelings too! -- Shared Region Modules that are found in DLLs are now correctly loaded automagically.

afrisby
mingchen 2007-11-24 01:31:42 +00:00
parent d7ec786244
commit 3ce6116e4a
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -346,12 +346,12 @@ namespace OpenSim
UDPServer udpServer; UDPServer udpServer;
Scene scene = SetupScene(regionInfo, out udpServer); Scene scene = SetupScene(regionInfo, out udpServer);
m_moduleLoader.InitialiseSharedModules(scene);
MainLog.Instance.Verbose("MODULES", "Loading Region's Modules"); MainLog.Instance.Verbose("MODULES", "Loading Region's Modules");
m_moduleLoader.PickupModules(scene, "."); m_moduleLoader.PickupModules(scene, ".");
m_moduleLoader.PickupModules(scene, "ScriptEngines"); m_moduleLoader.PickupModules(scene, "ScriptEngines");
m_moduleLoader.InitialiseSharedModules(scene);
scene.SetModuleInterfaces(); scene.SetModuleInterfaces();
//Server side object editing permissions checking //Server side object editing permissions checking

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

@ -121,7 +121,10 @@ namespace OpenSim.Region.Environment
IRegionModule module = LoadModule(dllName, moduleName); IRegionModule module = LoadModule(dllName, moduleName);
if (module != null) if (module != null)
{ {
m_loadedSharedModules.Add(module.Name, module); if (!m_loadedSharedModules.ContainsKey(module.Name))
{
m_loadedSharedModules.Add(module.Name, module);
}
} }
} }
@ -139,6 +142,11 @@ namespace OpenSim.Region.Environment
m_log.Verbose("MODULES", " [{0}]: Initializing.", module.Name); m_log.Verbose("MODULES", " [{0}]: Initializing.", module.Name);
InitializeModule(module, scene); InitializeModule(module, scene);
} }
else
{
m_log.Verbose("MODULES", " [{0}]: Loading Shared Module.", module.Name);
LoadSharedModule(dllName, module.Name);
}
} }
} }
} }