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

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

loading and not using it
0.8.2-post-fixes
Melanie Thielker 2015-08-16 19:01:23 +02:00
parent c83da03183
commit ce2aeb8424
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,6 +131,9 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
// Read the config again // Read the config again
string moduleString = string moduleString =
modulesConfig.GetString("Setup_" + node.Id, String.Empty); 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 // Get the port number, if there is one
if (moduleString != String.Empty) if (moduleString != String.Empty)
@ -365,6 +368,10 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
string moduleString = string moduleString =
modulesConfig.GetString("Setup_" + node.Id, String.Empty); 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 // Get the port number, if there is one
if (moduleString != String.Empty) if (moduleString != String.Empty)
{ {