diff options
| author | Melanie | 2013-03-01 23:54:00 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-01 23:54:00 +0000 |
| commit | a675f7d4c3af4550263985aafcefd11458f6d365 (patch) | |
| tree | 6966e1d313f402a1de65efee535de493d648b4aa /OpenSim/Region/OptionalModules/PrimLimitsModule | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Moved permissions config vars out of [Startup] into [Permissions]. Backwards ... (diff) | |
| download | opensim-SC-a675f7d4c3af4550263985aafcefd11458f6d365.zip opensim-SC-a675f7d4c3af4550263985aafcefd11458f6d365.tar.gz opensim-SC-a675f7d4c3af4550263985aafcefd11458f6d365.tar.bz2 opensim-SC-a675f7d4c3af4550263985aafcefd11458f6d365.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules/PrimLimitsModule')
| -rw-r--r-- | OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs index 39cabb5..a375da9 100644 --- a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs +++ b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs | |||
| @@ -57,9 +57,10 @@ namespace OpenSim.Region.OptionalModules | |||
| 57 | 57 | ||
| 58 | public void Initialise(IConfigSource config) | 58 | public void Initialise(IConfigSource config) |
| 59 | { | 59 | { |
| 60 | IConfig myConfig = config.Configs["Startup"]; | 60 | //IConfig myConfig = config.Configs["Startup"]; |
| 61 | 61 | ||
| 62 | string permissionModules = myConfig.GetString("permissionmodules", "DefaultPermissionsModule"); | 62 | string permissionModules = Util.GetConfigVarFromSections<string>(config, "permissionmodules", |
| 63 | new string[] { "Startup", "Permissions" }, "DefaultPermissionsModule"); | ||
| 63 | 64 | ||
| 64 | List<string> modules=new List<string>(permissionModules.Split(',')); | 65 | List<string> modules=new List<string>(permissionModules.Split(',')); |
| 65 | 66 | ||