Make Setup_XXX=disabled not even load the module at all, rather than

loading and not using it

1 files changed, 7 insertions, 0 deletions

diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
index 86f71d9..17edb67 100644
--- a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
@@ -131,6 +131,9 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
                 // Read the config again
                 string moduleString =
                         modulesConfig.GetString("Setup_" + node.Id, String.Empty);
+                // Test to see if we want this module
+                if (moduleString == "disabled")
+                    continue;
 
                 // Get the port number, if there is one
                 if (moduleString != String.Empty)
@@ -365,6 +368,10 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
                 string moduleString =
                         modulesConfig.GetString("Setup_" + node.Id, String.Empty);
 
+                // We may not want to load this at all
+                if (moduleString == "disabled")
+                    continue;
+
                 // Get the port number, if there is one
                 if (moduleString != String.Empty)
                 {