aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSimDefaults.ini
diff options
context:
space:
mode:
authorMelanie2011-10-30 10:16:25 +0000
committerMelanie2011-10-30 10:16:25 +0000
commit083b28de8c45589a43ce6ceed4dbfb70c698f2d0 (patch)
treefc494b5d401bf2190e8c2d9ee027021f330d6285 /bin/OpenSimDefaults.ini
parentFix the offline message module to revert core changes and restore avn (diff)
parentAdd missing max_listens_per_region to [LL_Functions] config section in OpenSi... (diff)
downloadopensim-SC-083b28de8c45589a43ce6ceed4dbfb70c698f2d0.zip
opensim-SC-083b28de8c45589a43ce6ceed4dbfb70c698f2d0.tar.gz
opensim-SC-083b28de8c45589a43ce6ceed4dbfb70c698f2d0.tar.bz2
opensim-SC-083b28de8c45589a43ce6ceed4dbfb70c698f2d0.tar.xz
Merge branch 'master' into bigmerge
Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to '')
-rw-r--r--bin/OpenSimDefaults.ini4
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index de2f787..3540a6e 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1060,6 +1060,10 @@
1060 1060
1061 AllowGodFunctions = false 1061 AllowGodFunctions = false
1062 1062
1063 ; Maximum number of llListen events we allow over the entire region.
1064 ; Set this to 0 to have no limit imposed
1065 max_listeners_per_region = 1000
1066
1063 ; Maximum number of llListen events we allow per script 1067 ; Maximum number of llListen events we allow per script
1064 ; Set this to 0 to have no limit imposed. 1068 ; Set this to 0 to have no limit imposed.
1065 max_listens_per_script = 64 1069 max_listens_per_script = 64