Merge branch 'master' of /var/git/opensim/
commit
935929c2b8
|
@ -352,13 +352,13 @@ namespace OpenSim
|
||||||
m_moduleLoader.InitialiseSharedModules(scene);
|
m_moduleLoader.InitialiseSharedModules(scene);
|
||||||
|
|
||||||
// Use this in the future, the line above will be deprecated soon
|
// Use this in the future, the line above will be deprecated soon
|
||||||
m_log.Info("[REGIONMODULE]: Loading Region's modules (new style)");
|
m_log.Info("[REGIONMODULES]: Loading Region's modules (new style)");
|
||||||
IRegionModulesController controller;
|
IRegionModulesController controller;
|
||||||
if (ApplicationRegistry.TryGet(out controller))
|
if (ApplicationRegistry.TryGet(out controller))
|
||||||
{
|
{
|
||||||
controller.AddRegionToModules(scene);
|
controller.AddRegionToModules(scene);
|
||||||
}
|
}
|
||||||
else m_log.Error("[REGIONMODULE]: The new RegionModulesController is missing...");
|
else m_log.Error("[REGIONMODULES]: The new RegionModulesController is missing...");
|
||||||
|
|
||||||
scene.SetModuleInterfaces();
|
scene.SetModuleInterfaces();
|
||||||
|
|
||||||
|
|
|
@ -34,6 +34,15 @@ using OpenSim.Region.Framework.Scenes;
|
||||||
|
|
||||||
namespace OpenSim.Region.Examples.SimpleModule
|
namespace OpenSim.Region.Examples.SimpleModule
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Example region module.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// This is an old and unmaintained region module which uses the old style module interface. It is not loaded into
|
||||||
|
/// OpenSim by default. If you want to try enabling it, look in the bin folder of this project.
|
||||||
|
/// Please see the README.txt in this project on the filesystem for some more information.
|
||||||
|
/// Nonetheless, it may contain some useful example code so has been left here for now.
|
||||||
|
/// </remarks>
|
||||||
public class RegionModule : IRegionModule
|
public class RegionModule : IRegionModule
|
||||||
{
|
{
|
||||||
#region IRegionModule Members
|
#region IRegionModule Members
|
||||||
|
|
Loading…
Reference in New Issue