1 files changed, 47 insertions, 9 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 50366a6..c07e1ab 100755..100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -241,6 +241,36 @@
     ;; server to send mail through.
     ; emailmodule = DefaultEmailModule
 
+    ;# {SpawnPointRouting} {} {Set routing method for Telehub Spawnpoints} {closest random sequence} closest
+    ;; SpawnPointRouting adjusts the landing for incoming avatars.
+    ;; "closest" will place the avatar at the SpawnPoint located in the closest
+    ;; available spot to the destination (typically map click/landmark).
+    ;; "random" will place the avatar on a randomly selected spawnpoint;
+    ;; "sequence" will place the avatar on the next sequential SpawnPoint
+    ; SpawnPointRouting = closest
+
+    ;# {TelehubAllowLandmark} {} {Allow users with landmarks to override telehub routing} {true false} false
+    ;; TelehubAllowLandmark allows users with landmarks to override telehub routing and land at the landmark coordinates when set to true
+    ;; default is false
+    ; TelehubAllowLandmark = false
+
+    ;# Comma separated list of viewers which may gain access to the regions.
+    ;; One can use a Substring of the viewer name to enable only certain subversions
+    ;; 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 = 
+
+    ;# Comma 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 subversions
+    ;; 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 = 
+
+
 [Estates]
     ; If these values are commented out then the user will be asked for estate details when required (this is the normal case).
         ; If these values are uncommented then they will be used to create a default estate as necessary.
@@ -273,6 +303,12 @@
     ;# {host_domain_header_from} {[Startup]emailmodule:DefaultEmailModule enabled:true} {From address to use in the sent email header?} {} 127.0.0.1
     ; host_domain_header_from = "127.0.0.1"
 
+    ;# {email_pause_time} {[Startup]emailmodule:DefaultEmailModule enabled:true} {Period in seconds to delay after an email is sent.} {} 20
+    ; email_pause_time = 20
+
+    ;# {email_max_size} {[Startup]emailmodule:DefaultEmailModule enabled:true} {Maximum total size of email in bytes.} {} 4096
+    ; email_max_size = 4096
+
     ;# {SMTP_SERVER_HOSTNAME} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server name?} {} 127.0.0.1
     ; SMTP_SERVER_HOSTNAME = "127.0.0.1"
 
@@ -285,7 +321,6 @@
     ;# {SMTP_SERVER_PASSWORD} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server password} {}
     ; SMTP_SERVER_PASSWORD = ""
 
-
 [Network]
     ;; Configure the remote console user here. This will not actually be used
     ;; unless you use -console=rest at startup.
@@ -638,8 +673,11 @@
     ; AllowLightShareFunctions = false
 
     ;# {OSFunctionThreatLevel} {Enabled:true AllowOSFunctions:true} {OSFunction threat level? (DANGEROUS!)} {None VeryLow Low Moderate High VeryHigh Severe} VeryLow
-    ;; Threat level to allow, one of None, VeryLow, Low, Moderate, High,
-    ;; VeryHigh, Severe
+    ;; Threat level to allow, one of None, VeryLow, Low, Moderate, High, VeryHigh, Severe
+    ;; See http://opensimulator.org/wiki/Threat_level for more information on these levels.
+    ;; We do not recommend that use set a general level above Low unless you have a high level of trust
+    ;; in all the users that can run scripts in your simulator.  It is safer to explicitly
+    ;; allow certain types of user to run higher threat level OSSL functions, as detailed later on.
     OSFunctionThreatLevel = VeryLow
 
     ; OS Functions enable/disable
@@ -656,10 +694,10 @@
     ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb
     
     ; Comma separated list of owner classes that allow the function for a particular class of owners. Choices are
-    ; - PARCEL_GROUP_MEMBER: allow if objectgroup is the same group as the parcel
-    ; - PARCEL_OWNER: allow if the objectowner is parcelowner
-    ; - ESTATE_MANAGER: allow if the object owner is a estate manager
-    ; - ESTATE_OWNER: allow if objectowner is estateowner
+    ; - PARCEL_GROUP_MEMBER:  allow if the object group is the same group as the parcel
+    ; - PARCEL_OWNER:         allow if the object owner is the parcel owner
+    ; - ESTATE_MANAGER:       allow if the object owner is an estate manager
+    ; - ESTATE_OWNER:         allow if the object owner is the estate owner
     ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb, PARCEL_OWNER, ESTATE_OWNER>, ...
 
     ; You can also use script creators as the uuid
@@ -677,7 +715,7 @@
     ;; Sets the multiplier for the scripting delays
     ; ScriptDelayFactor = 1.0
 
-    ;; The factor the 10 m distances llimits are multiplied by
+    ;; The factor the 10 m distances limits are multiplied by
     ; ScriptDistanceLimitFactor = 1.0
 
     ;; Maximum length of notecard line read
@@ -780,7 +818,7 @@
     ;; groups service if the service is using these keys
     ; XmlRpcServiceReadKey    = 1234
     ; XmlRpcServiceWriteKey   = 1234
-        
+
 [InterestManagement]
      ;# {UpdatePrioritizationScheme} {} {Update prioritization scheme?} {BestAvatarResponsiveness Time Distance SimpleAngularDistance FrontBack} BestAvatarResponsiveness
      ;; This section controls how state updates are prioritized for each client