aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2015-08-16 19:01:23 +0200
committerMelanie Thielker2015-08-16 19:01:23 +0200
commitce2aeb8424656e53bc30eb3c1e7a03c682de2971 (patch)
tree3a7e54580b53fa612e406dc0e2c5f12043bb6c8b
parentCreate want and need lists for agent data interchange formats. (diff)
downloadopensim-SC_OLD-ce2aeb8424656e53bc30eb3c1e7a03c682de2971.zip
opensim-SC_OLD-ce2aeb8424656e53bc30eb3c1e7a03c682de2971.tar.gz
opensim-SC_OLD-ce2aeb8424656e53bc30eb3c1e7a03c682de2971.tar.bz2
opensim-SC_OLD-ce2aeb8424656e53bc30eb3c1e7a03c682de2971.tar.xz
Make Setup_XXX=disabled not even load the module at all, rather than
loading and not using it
-rw-r--r--OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs7
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
131 // Read the config again 131 // Read the config again
132 string moduleString = 132 string moduleString =
133 modulesConfig.GetString("Setup_" + node.Id, String.Empty); 133 modulesConfig.GetString("Setup_" + node.Id, String.Empty);
134 // Test to see if we want this module
135 if (moduleString == "disabled")
136 continue;
134 137
135 // Get the port number, if there is one 138 // Get the port number, if there is one
136 if (moduleString != String.Empty) 139 if (moduleString != String.Empty)
@@ -365,6 +368,10 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
365 string moduleString = 368 string moduleString =
366 modulesConfig.GetString("Setup_" + node.Id, String.Empty); 369 modulesConfig.GetString("Setup_" + node.Id, String.Empty);
367 370
371 // We may not want to load this at all
372 if (moduleString == "disabled")
373 continue;
374
368 // Get the port number, if there is one 375 // Get the port number, if there is one
369 if (moduleString != String.Empty) 376 if (moduleString != String.Empty)
370 { 377 {