diff options
author | Melanie Thielker | 2013-09-08 17:53:21 +0200 |
---|---|---|
committer | Melanie Thielker | 2013-09-08 17:53:21 +0200 |
commit | 59290854f24f47ee7cb8b2a242e3f771fa30229b (patch) | |
tree | 4e5302634e56b7c8d91c43c066fc7b0daacfcd46 /OpenSim/Region/Application/OpenSimBase.cs | |
parent | Bring Core Groups up to current version (diff) | |
download | opensim-SC_OLD-59290854f24f47ee7cb8b2a242e3f771fa30229b.zip opensim-SC_OLD-59290854f24f47ee7cb8b2a242e3f771fa30229b.tar.gz opensim-SC_OLD-59290854f24f47ee7cb8b2a242e3f771fa30229b.tar.bz2 opensim-SC_OLD-59290854f24f47ee7cb8b2a242e3f771fa30229b.tar.xz |
Reinstate SecurePermissionsLoading functionality, default ON
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 40 |
1 files changed, 16 insertions, 24 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 7361f50..25af9ac 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -195,7 +195,9 @@ namespace OpenSim | |||
195 | 195 | ||
196 | m_securePermissionsLoading = startupConfig.GetBoolean("SecurePermissionsLoading", true); | 196 | m_securePermissionsLoading = startupConfig.GetBoolean("SecurePermissionsLoading", true); |
197 | 197 | ||
198 | string permissionModules = startupConfig.GetString("permissionmodules", "DefaultPermissionsModule"); | 198 | string permissionModules = Util.GetConfigVarFromSections<string>(Config, "permissionmodules", |
199 | new string[] { "Startup", "Permissions" }, "DefaultPermissionsModule"); | ||
200 | |||
199 | m_permsModules = new List<string>(permissionModules.Split(',')); | 201 | m_permsModules = new List<string>(permissionModules.Split(',')); |
200 | } | 202 | } |
201 | 203 | ||
@@ -392,29 +394,19 @@ namespace OpenSim | |||
392 | } | 394 | } |
393 | else m_log.Error("[REGIONMODULES]: The new RegionModulesController is missing..."); | 395 | else m_log.Error("[REGIONMODULES]: The new RegionModulesController is missing..."); |
394 | 396 | ||
395 | // XPTO: Fix this | 397 | if (m_securePermissionsLoading) |
396 | // if (m_securePermissionsLoading) | 398 | { |
397 | // { | 399 | foreach (string s in m_permsModules) |
398 | // foreach (string s in m_permsModules) | 400 | { |
399 | // { | 401 | if (!scene.RegionModules.ContainsKey(s)) |
400 | // if (!scene.RegionModules.ContainsKey(s)) | 402 | { |
401 | // { | 403 | m_log.Fatal("[MODULES]: Required module " + s + " not found."); |
402 | // bool found = false; | 404 | Environment.Exit(0); |
403 | // foreach (IRegionModule m in modules) | 405 | } |
404 | // { | 406 | } |
405 | // if (m.Name == s) | 407 | |
406 | // { | 408 | m_log.InfoFormat("[SCENE]: Secure permissions loading enabled, modules loaded: {0}", String.Join(" ", m_permsModules)); |
407 | // found = true; | 409 | } |
408 | // } | ||
409 | // } | ||
410 | // if (!found) | ||
411 | // { | ||
412 | // m_log.Fatal("[MODULES]: Required module " + s + " not found."); | ||
413 | // Environment.Exit(0); | ||
414 | // } | ||
415 | // } | ||
416 | // } | ||
417 | // } | ||
418 | 410 | ||
419 | scene.SetModuleInterfaces(); | 411 | scene.SetModuleInterfaces(); |
420 | // First Step of bootreport sequence | 412 | // First Step of bootreport sequence |