From 4999d7920a63af99c6bba53134d4c0e891b99573 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 2 Mar 2013 01:23:01 +0000
Subject: Revert "Removed more vars from [Startup]. I think these were already
 moved elsewhere, because I can't find any reference to them in the code."

This reverts commit efa722786509bd8e02e23f11da974b4282dbd185.
---
 bin/OpenSim.ini.example | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'bin')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 0eb43a2..16e314b 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -256,6 +256,26 @@
     ;; default is false
     ; TelehubAllowLandmark = false
 
+    ;# {AllowedClients} {} {Bar (|) separated list of allowed clients} {}
+    ;; Bar (|) separated list of viewers which may gain access to the regions.
+    ;; One can use a substring of the viewer name to enable only certain
+    ;; versions
+    ;; Example: Agent uses the viewer "Imprudence 1.3.2.0"
+    ;; - "Imprudence" has access
+    ;; - "Imprudence 1.3" has access
+    ;; - "Imprudence 1.3.1" has no access
+    ; AllowedViewerList = 
+
+    ;# {BannedClients} {} {Bar (|) separated list of banned clients} {}
+    ;# Bar (|) separated list of viewers which may not gain access to the regions.
+    ;; One can use a Substring of the viewer name to disable only certain
+    ;; versions
+    ;; Example: Agent uses the viewer "Imprudence 1.3.2.0"
+    ;; - "Imprudence" has no access
+    ;; - "Imprudence 1.3" has no access
+    ;; - "Imprudence 1.3.1" has access
+    ; BannedViewerList = 
+
 [Map]
     ;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true
     ;; Map tile options.  
-- 
cgit v1.1


From 1bc8692a999f4e80b90b9a1eb7c7428b2e74214e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 2 Mar 2013 01:43:54 +0000
Subject: Move AllowedClients and BannedClients section to new [AccessControl]
 section in OpenSim.ini from [Startup]

This change also corrects the setting names - they were actually wrong (though the text in {} was correct).
If there are settings in [Startup] they will continue to be used and anything there will override settings in [AccessControl]
---
 bin/OpenSim.ini.example | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 16e314b..eab1fce 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -256,6 +256,8 @@
     ;; default is false
     ; TelehubAllowLandmark = false
 
+
+[AccessControl]
     ;# {AllowedClients} {} {Bar (|) separated list of allowed clients} {}
     ;; Bar (|) separated list of viewers which may gain access to the regions.
     ;; One can use a substring of the viewer name to enable only certain
@@ -264,7 +266,7 @@
     ;; - "Imprudence" has access
     ;; - "Imprudence 1.3" has access
     ;; - "Imprudence 1.3.1" has no access
-    ; AllowedViewerList = 
+    ; AllowedClients =
 
     ;# {BannedClients} {} {Bar (|) separated list of banned clients} {}
     ;# Bar (|) separated list of viewers which may not gain access to the regions.
@@ -274,7 +276,8 @@
     ;; - "Imprudence" has no access
     ;; - "Imprudence 1.3" has no access
     ;; - "Imprudence 1.3.1" has access
-    ; BannedViewerList = 
+    ; BannedClients = 
+
 
 [Map]
     ;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true
@@ -310,6 +313,7 @@
     ;; got a large number of objects, so you can turn it off here if you'd like.
     ; DrawPrimOnMapTile = true
 
+
 [Permissions]
     ;# {permissionmodules} {} {Permission modules to use (may specify multiple modules, separated by comma} {} DefaultPermissionsModule
     ;; Permission modules to use, separated by comma.
-- 
cgit v1.1


From b47ffb5dc40418705bb16669e47130aeddeaec6c Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 2 Mar 2013 13:02:02 -0800
Subject: Added existance and default value for [XEngine]MinTimerInterval to
 OpenSimDefaults.ini

---
 bin/OpenSimDefaults.ini | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'bin')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 091107f..417150a 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1400,6 +1400,10 @@
     ; up the system to malicious scripters
     ; NotecardLineReadCharsMax = 255
 
+    ; Minimum settable timer interval. Any timer setting less than this is
+    ; rounded up to this minimum interval.
+    ; MinTimerInterval = 0.5
+
     ; Sensor settings
     SensorMaxRange = 96.0
     SensorMaxResults = 16
-- 
cgit v1.1