aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
diff options
context:
space:
mode:
authorBlueWall2013-03-05 15:30:54 -0500
committerBlueWall2013-03-05 15:30:54 -0500
commitf676408e2a45101bcab0a33f598ea9047f02036a (patch)
treeeb34ea8fb0a783ee466873462285eba629ab6405 /OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
parentAdd method to remove JsonRpc Handlers from the server (diff)
parent* Add a Max Payload size property to the Websocket Server Handler. If you ... (diff)
downloadopensim-SC-f676408e2a45101bcab0a33f598ea9047f02036a.zip
opensim-SC-f676408e2a45101bcab0a33f598ea9047f02036a.tar.gz
opensim-SC-f676408e2a45101bcab0a33f598ea9047f02036a.tar.bz2
opensim-SC-f676408e2a45101bcab0a33f598ea9047f02036a.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs')
-rw-r--r--OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
index c1957e2..a6d43f1 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