diff options
author | Melanie | 2013-09-16 22:32:53 +0100 |
---|---|---|
committer | Melanie | 2013-09-16 22:32:53 +0100 |
commit | 72206a0e294865bf0c93ea16910276a188d51ce6 (patch) | |
tree | f7769826d78863b2e0e416fe529f0c55065e0acd /OpenSim/Region/Application/OpenSimBase.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Mono 2.0 fix - call ToArray() explicitly (diff) | |
download | opensim-SC_OLD-72206a0e294865bf0c93ea16910276a188d51ce6.zip opensim-SC_OLD-72206a0e294865bf0c93ea16910276a188d51ce6.tar.gz opensim-SC_OLD-72206a0e294865bf0c93ea16910276a188d51ce6.tar.bz2 opensim-SC_OLD-72206a0e294865bf0c93ea16910276a188d51ce6.tar.xz |
Merge branch 'avination-current' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-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 0f3bac4..4891c1a 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -196,7 +196,9 @@ namespace OpenSim | |||
196 | 196 | ||
197 | m_securePermissionsLoading = startupConfig.GetBoolean("SecurePermissionsLoading", true); | 197 | m_securePermissionsLoading = startupConfig.GetBoolean("SecurePermissionsLoading", true); |
198 | 198 | ||
199 | string permissionModules = startupConfig.GetString("permissionmodules", "DefaultPermissionsModule"); | 199 | string permissionModules = Util.GetConfigVarFromSections<string>(Config, "permissionmodules", |
200 | new string[] { "Startup", "Permissions" }, "DefaultPermissionsModule"); | ||
201 | |||
200 | m_permsModules = new List<string>(permissionModules.Split(',')); | 202 | m_permsModules = new List<string>(permissionModules.Split(',')); |
201 | 203 | ||
202 | managedStatsURI = startupConfig.GetString("ManagedStatsRemoteFetchURI", String.Empty); | 204 | managedStatsURI = startupConfig.GetString("ManagedStatsRemoteFetchURI", String.Empty); |
@@ -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.ToArray())); |
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 |