From ce2aeb8424656e53bc30eb3c1e7a03c682de2971 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sun, 16 Aug 2015 19:01:23 +0200
Subject: Make Setup_XXX=disabled not even load the module at all, rather than
 loading and not using it

---
 .../RegionModulesController/RegionModulesControllerPlugin.cs       | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'OpenSim/ApplicationPlugins')

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)
                 {
-- 
cgit v1.1