Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Interfaces/IEstateModule.cs
This commit is contained in:
Melanie
2012-04-11 23:35:27 +01:00
13 changed files with 171 additions and 25 deletions

View File

@@ -1129,7 +1129,7 @@
; Maximum number of llListen events we allow over the entire region.
; Set this to 0 to have no limit imposed
max_listeners_per_region = 1000
max_listens_per_region = 1000
; Maximum number of llListen events we allow per script
; Set this to 0 to have no limit imposed.