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

Merge branch 'master' of /var/git/opensim/

viewer-2-initial-appearance
opensim mirror account 2010-12-03 18:40:03 -08:00
parent cc471d9ca6 510b55c7f0
commit 2756e8fd67
2 changed files with 54 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
View File

@ -91,66 +91,24 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
{ {
if (node.Type.GetInterface(typeof(ISharedRegionModule).ToString()) != null) if (node.Type.GetInterface(typeof(ISharedRegionModule).ToString()) != null)
{ {
// Get the config string if (CheckModuleEnabled(node, modulesConfig))
string moduleString =
modulesConfig.GetString("Setup_" + node.Id, String.Empty);
// We have a selector
if (moduleString != String.Empty)
{ {
// Allow disabling modules even if they don't have m_log.DebugFormat("[REGIONMODULES]: Found shared region module {0}, class {1}", node.Id, node.Type);
// support for it m_sharedModules.Add(node);
if (moduleString == "disabled")
continue;
// Split off port, if present
string[] moduleParts = moduleString.Split(new char[] { '/' }, 2);
// Format is [port/][class]
string className = moduleParts[0];
if (moduleParts.Length > 1)
className = moduleParts[1];
// Match the class name if given
if (className != String.Empty &&
node.Type.ToString() != className)
continue;
} }
m_log.DebugFormat("[REGIONMODULES]: Found shared region module {0}, class {1}", node.Id, node.Type);
m_sharedModules.Add(node);
} }
else if (node.Type.GetInterface(typeof(INonSharedRegionModule).ToString()) != null) else if (node.Type.GetInterface(typeof(INonSharedRegionModule).ToString()) != null)
{ {
// Get the config string if (CheckModuleEnabled(node, modulesConfig))
string moduleString =
modulesConfig.GetString("Setup_" + node.Id, String.Empty);
// We have a selector
if (moduleString != String.Empty)
{ {
// Allow disabling modules even if they don't have m_log.DebugFormat("[REGIONMODULES]: Found non-shared region module {0}, class {1}", node.Id, node.Type);
// support for it m_nonSharedModules.Add(node);
if (moduleString == "disabled")
continue;
// Split off port, if present
string[] moduleParts = moduleString.Split(new char[] { '/' }, 2);
// Format is [port/][class]
string className = moduleParts[0];
if (moduleParts.Length > 1)
className = moduleParts[1];
// Match the class name if given
if (className != String.Empty &&
node.Type.ToString() != className)
continue;
} }
m_log.DebugFormat("[REGIONMODULES]: Found non-shared region module {0}, class {1}", node.Id, node.Type);
m_nonSharedModules.Add(node);
} }
else else
{
m_log.DebugFormat("[REGIONMODULES]: Found unknown type of module {0}, class {1}", node.Id, node.Type); m_log.DebugFormat("[REGIONMODULES]: Found unknown type of module {0}, class {1}", node.Id, node.Type);
}
} }
// Load and init the module. We try a constructor with a port // Load and init the module. We try a constructor with a port
@ -197,8 +155,6 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
m_sharedInstances.Add(module); m_sharedInstances.Add(module);
module.Initialise(m_openSim.ConfigSource.Source); module.Initialise(m_openSim.ConfigSource.Source);
} }
} }
public void PostInitialise () public void PostInitialise ()
@ -210,7 +166,6 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
{ {
module.PostInitialise(); module.PostInitialise();
} }
} }
#endregion #endregion
@ -244,7 +199,6 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
#endregion #endregion
public string Version public string Version
{ {
get get
@ -263,6 +217,42 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
#region IRegionModulesController implementation #region IRegionModulesController implementation
/// <summary>
/// Check that the given module is no disabled in the [Modules] section of the config files.
/// </summary>
/// <param name="node"></param>
/// <param name="modulesConfig">The config section</param>
/// <returns>true if the module is enabled, false if it is disabled</returns>
protected bool CheckModuleEnabled(TypeExtensionNode node, IConfig modulesConfig)
{
// Get the config string
string moduleString =
modulesConfig.GetString("Setup_" + node.Id, String.Empty);
// We have a selector
if (moduleString != String.Empty)
{
// Allow disabling modules even if they don't have
// support for it
if (moduleString == "disabled")
return false;
// Split off port, if present
string[] moduleParts = moduleString.Split(new char[] { '/' }, 2);
// Format is [port/][class]
string className = moduleParts[0];
if (moduleParts.Length > 1)
className = moduleParts[1];
// Match the class name if given
if (className != String.Empty &&
node.Type.ToString() != className)
return false;
}
return true;
}
// The root of all evil. // The root of all evil.
// This is where we handle adding the modules to scenes when they // This is where we handle adding the modules to scenes when they
// load. This means that here we deal with replaceable interfaces, // load. This means that here we deal with replaceable interfaces,

15
OpenSim/Region/OptionalModules/Example/BareBonesNonShared/BareBonesNonSharedModule.cs
View File

@ -41,10 +41,13 @@ namespace OpenSim.Region.OptionalModules.Example.BareBonesNonShared
/// <remarks> /// <remarks>
/// This module is the simplest possible example of a non-shared region module (a module where each scene/region /// This module is the simplest possible example of a non-shared region module (a module where each scene/region
/// in the simulator has its own copy). If anybody wants to create a more complex example in the future then /// in the simulator has its own copy). If anybody wants to create a more complex example in the future then
/// please create a separate example. /// please create a separate class.
/// ///
/// This module is not active by default. If you want to see it in action, /// This module is not active by default. If you want to see it in action,
/// then just uncomment the line below starting with [Extension(Path... /// then just uncomment the line below starting with [Extension(Path...
///
/// When the module is enabled it will print messages when it receives certain events to the screen and the log
/// file.
/// </remarks> /// </remarks>
//[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "BareBonesNonSharedModule")] //[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "BareBonesNonSharedModule")]
public class BareBonesNonSharedModule : INonSharedRegionModule public class BareBonesNonSharedModule : INonSharedRegionModule
@ -57,27 +60,27 @@ namespace OpenSim.Region.OptionalModules.Example.BareBonesNonShared
public void Initialise(IConfigSource source) public void Initialise(IConfigSource source)
{ {
m_log.DebugFormat("[BARE BONES]: INITIALIZED MODULE"); m_log.DebugFormat("[BARE BONES NON SHARED]: INITIALIZED MODULE");
} }
public void Close() public void Close()
{ {
m_log.DebugFormat("[BARE BONES]: CLOSED MODULE"); m_log.DebugFormat("[BARE BONES NON SHARED]: CLOSED MODULE");
} }
public void AddRegion(Scene scene) public void AddRegion(Scene scene)
{ {
m_log.DebugFormat("[BARE BONES]: REGION {0} ADDED", scene.RegionInfo.RegionName); m_log.DebugFormat("[BARE BONES NON SHARED]: REGION {0} ADDED", scene.RegionInfo.RegionName);
} }
public void RemoveRegion(Scene scene) public void RemoveRegion(Scene scene)
{ {
m_log.DebugFormat("[BARE BONES]: REGION {0} REMOVED", scene.RegionInfo.RegionName); m_log.DebugFormat("[BARE BONES NON SHARED]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
} }
public void RegionLoaded(Scene scene) public void RegionLoaded(Scene scene)
{ {
m_log.DebugFormat("[BARE BONES]: REGION {0} LOADED", scene.RegionInfo.RegionName); m_log.DebugFormat("[BARE BONES NON SHARED]: REGION {0} LOADED", scene.RegionInfo.RegionName);
} }
} }
} }