diff options
author | Justin Clark-Casey (justincc) | 2014-03-25 00:19:24 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-03-25 00:19:24 +0000 |
commit | e12c044eabf223828d00a1ac45a8ed43215b882b (patch) | |
tree | 041fd4b5a588a96b94464f7550404b15f9c07ebf /OpenSim/Region | |
parent | Rename SOG.InSceneBackup to CanBeBackedUp to reflect its actual functionality. (diff) | |
download | opensim-SC_OLD-e12c044eabf223828d00a1ac45a8ed43215b882b.zip opensim-SC_OLD-e12c044eabf223828d00a1ac45a8ed43215b882b.tar.gz opensim-SC_OLD-e12c044eabf223828d00a1ac45a8ed43215b882b.tar.bz2 opensim-SC_OLD-e12c044eabf223828d00a1ac45a8ed43215b882b.tar.xz |
Don't fail to enable permissions modules correctly if there is any leading or trailing whitespace between comma separate module combinations.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index 45617fc..89e2b55 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
@@ -27,6 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Linq; | ||
30 | using System.Reflection; | 31 | using System.Reflection; |
31 | using log4net; | 32 | using log4net; |
32 | using Nini.Config; | 33 | using Nini.Config; |
@@ -160,7 +161,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
160 | string permissionModules = Util.GetConfigVarFromSections<string>(config, "permissionmodules", | 161 | string permissionModules = Util.GetConfigVarFromSections<string>(config, "permissionmodules", |
161 | new string[] { "Startup", "Permissions" }, "DefaultPermissionsModule"); | 162 | new string[] { "Startup", "Permissions" }, "DefaultPermissionsModule"); |
162 | 163 | ||
163 | List<string> modules = new List<string>(permissionModules.Split(',')); | 164 | List<string> modules = new List<string>(permissionModules.Split(',').Select(m => m.Trim())); |
164 | 165 | ||
165 | if (!modules.Contains("DefaultPermissionsModule")) | 166 | if (!modules.Contains("DefaultPermissionsModule")) |
166 | return; | 167 | return; |
diff --git a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs index a6d43f1..8b4d231 100644 --- a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs +++ b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs | |||
@@ -26,8 +26,9 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Reflection; | ||
30 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Linq; | ||
31 | using System.Reflection; | ||
31 | using log4net; | 32 | using log4net; |
32 | using Mono.Addins; | 33 | using Mono.Addins; |
33 | using Nini.Config; | 34 | using Nini.Config; |
@@ -62,7 +63,7 @@ namespace OpenSim.Region.OptionalModules | |||
62 | string permissionModules = Util.GetConfigVarFromSections<string>(config, "permissionmodules", | 63 | string permissionModules = Util.GetConfigVarFromSections<string>(config, "permissionmodules", |
63 | new string[] { "Startup", "Permissions" }, "DefaultPermissionsModule"); | 64 | new string[] { "Startup", "Permissions" }, "DefaultPermissionsModule"); |
64 | 65 | ||
65 | List<string> modules=new List<string>(permissionModules.Split(',')); | 66 | List<string> modules = new List<string>(permissionModules.Split(',').Select(m => m.Trim())); |
66 | 67 | ||
67 | if(!modules.Contains("PrimLimitsModule")) | 68 | if(!modules.Contains("PrimLimitsModule")) |
68 | return; | 69 | return; |