diff options
| author | Robert Adams | 2015-09-08 04:54:16 -0700 |
|---|---|---|
| committer | Robert Adams | 2015-09-08 04:54:16 -0700 |
| commit | e5367d822be9b05e74c859afe2d2956a3e95aa33 (patch) | |
| tree | e904050a30715df587aa527d7f313755177726a7 /bin/OpenSimDefaults.ini | |
| parent | add lost admin_reset_land method (diff) | |
| parent | Deleted access control spec from [LoginService] section of standalone config.... (diff) | |
| download | opensim-SC-e5367d822be9b05e74c859afe2d2956a3e95aa33.zip opensim-SC-e5367d822be9b05e74c859afe2d2956a3e95aa33.tar.gz opensim-SC-e5367d822be9b05e74c859afe2d2956a3e95aa33.tar.bz2 opensim-SC-e5367d822be9b05e74c859afe2d2956a3e95aa33.tar.xz | |
Merge of ubitworkvarnew with opensim/master as of 20150905.
This integrates the OpenSim refactoring to make physics, etc into modules.
AVN physics hasn't been moved to new location.
Does not compile yet.
Merge branch 'osmaster' into mbworknew1
Diffstat (limited to 'bin/OpenSimDefaults.ini')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 05ea867..786c81b 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -531,6 +531,14 @@ | |||
| 531 | ; many simultaneous requests, default is 30 and is currently applied only to assets | 531 | ; many simultaneous requests, default is 30 and is currently applied only to assets |
| 532 | ;MaxRequestConcurrency = 30 | 532 | ;MaxRequestConcurrency = 30 |
| 533 | 533 | ||
| 534 | [AccessControl] | ||
| 535 | ; Viewer-based access control. |-separated list of allowed viewers. | ||
| 536 | ; AllowedClients = "" | ||
| 537 | |||
| 538 | ; Viewer-based access control. |-separated list of denied viewers. | ||
| 539 | ; No restrictions by default. | ||
| 540 | ; DeniedClients = "" | ||
| 541 | |||
| 534 | 542 | ||
| 535 | [ClientStack.LindenUDP] | 543 | [ClientStack.LindenUDP] |
| 536 | ; Set this to true to process incoming packets asynchronously. Networking is | 544 | ; Set this to true to process incoming packets asynchronously. Networking is |