From 6218913345ae22ef5c95fa71ee4f36f46c7a5644 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 8 Nov 2016 11:22:08 +0000
Subject:  add some configuration options missing in OpenSimDeafults.ini but
 present in OpenSim.ini.example

---
 bin/OpenSimDefaults.ini | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index c4a01a6..6b04424 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -306,12 +306,23 @@
 
     DefaultScriptEngine = "XEngine"
 
+    ; Http proxy setting for llHTTPRequest and dynamic texture loading, if
+    ; required
+    ; HttpProxy = "http://proxy.com:8080"
+
+    ; If you're using HttpProxy, then you can set HttpProxyExceptions to a
+    ; list of regular expressions for URLs that you don't want to go through
+    ; the proxy.
+    ; For example, servers inside your firewall.
+    ; Separate patterns with a ';'
+    ; HttpProxyExceptions = ".mydomain.com;localhost"
+    
     ; ##
     ; ## EMAIL MODULE
     ; ##
 
     ;emailmodule = DefaultEmailModule
-
+    
     ; ##
     ; ## ANIMATIONS
     ; ##
@@ -324,6 +335,10 @@
     ; won't look right until the physics engine supports it
     ; (i.e delays takeoff for a moment)
     
+    ; #
+    ; # statistics
+    ; # 
+    
     ; Simulator statistics are output to the console periodically at debug level INFO.
     ; Setting this to zero disables this output.
     ; LogShowStatsSeconds = 3600
@@ -362,6 +377,23 @@
     ; system with reduced logging
     LogOverloads = True
 
+    ; #
+    ; # Telehubs
+    ; #
+
+    ; 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 allows users with landmarks to override telehub
+    ; routing and land at the landmark coordinates when set to true
+    ; default is false
+    ; TelehubAllowLandmark = false
+   
+    
 [Map]
     ;WorldMapModule = "WorldMap"
     ;MapImageModule = "MapImageModule"
-- 
cgit v1.1