1 files changed, 50 insertions, 24 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 67963a5..0cd411e 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -86,8 +86,8 @@
     ;; from the selected region_info_source.
     allow_regionless = false
 
-        ;; Allow child agents to see into the region even if their root counterpart isn't allowed in here
-        see_into_region = true
+    ;; Allow child agents to see into the region even if their root counterpart isn't allowed in here
+    see_into_region = true
 
     ; Maximum number of position, rotation and scale changes for each prim that the simulator will store for later undos
     ; Increasing this number will increase memory usage.
@@ -399,7 +399,6 @@
   ; ProfileURL = http://127.0.0.1:9000
 
 
-
 [SMTP]
     enabled = false
 
@@ -461,6 +460,7 @@
     ; many simultaneous requests, default is 30 and is currently applied only to assets
     ;MaxRequestConcurrency = 30
 
+
 [ClientStack.LindenUDP]
     ; Set this to true to process incoming packets asynchronously. Networking is
     ; already separated from packet handling with a queue, so this will only
@@ -560,6 +560,7 @@
     ;
     ;PausedAckTimeout = 300
 
+
 [ClientStack.LindenCaps]
     ;; Long list of capabilities taken from 
     ;; http://wiki.secondlife.com/wiki/Current_Sim_Capabilities
@@ -632,11 +633,10 @@
     Cap_FetchInventoryDescendents2 = "localhost"
     Cap_FetchInventory2 = "localhost"
 
-        ; Capability for searching for people
-        Cap_AvatarPickerSearch = "localhost"
+    ; Capability for searching for people
+    Cap_AvatarPickerSearch = "localhost"
 
     
-
 [Chat]
     ; Controls whether the chat module is enabled.  Default is true.
     enabled = true;
@@ -652,9 +652,21 @@
 
 
 [EntityTransfer]
-    ; The maximum distance in regions that an agent is allowed to teleport along the x or y axis
-    ; This is set to 4095 because current viewers can't handle teleports that are greater than this distance
-    max_distance = 4095
+    ; The maximum protocol version that we will use for outgoing transfers
+    ; Valid values are 
+    ; "SIMULATION/0.2"
+    ;   - this is the default.  A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol
+    ;   - this protocol is more efficient than "SIMULATION/0.1"
+    ; "SIMULATION/0.1" 
+    ;   - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
+    MaxOutgoingTransferVersion = "SIMULATION/0.2"
+
+    ; The maximum distance in regions that an agent is allowed to teleport 
+    ; along the x or y axis. This is set to 16383 because current viewers 
+    ; can't handle teleports that are greater than this distance
+    ; Setting to 0 will allow teleports of any distance
+    ;
+    max_distance = 16383
 
     ; Minimum user level required for HyperGrid teleports
     LevelHGTeleport = 0
@@ -953,6 +965,7 @@
     ; Default is false.
     ;force_simple_prim_meshing = true
 
+
 [BulletSim]
     ; All the BulletSim parameters can be displayed with the console command
     ;   "physics get all" and all are defined in the source file
@@ -1268,6 +1281,7 @@
     ; Maximum number of external urls that scripts can set up in this simulator (e.g. via llRequestURL())
     max_external_urls_per_simulator = 100
 
+
 [DataSnapshot]
     ; The following set of configs pertains to search.
     ; Set index_sims to true to enable search engines to index your searchable data
@@ -1672,31 +1686,36 @@
      RootReprioritizationDistance = 10.0
      ChildReprioritizationDistance = 20.0
 
+
 [Monitoring]
     ; Enable region monitoring
     ; If true, this will print out an error if more than a minute has passed since the last simulator frame
     ; Also is another source of region statistics provided via the regionstats URL
     Enabled = true
 
-; View region statistics via a web page
-; See http://opensimulator.org/wiki/FAQ#Region_Statistics_on_a_Web_Page
-; Use a web browser and type in the "Login URI" + "/SStats/"
-; For example- http://127.0.0.1:9000/SStats/
+
 [WebStats]
-; enabled=false
+    ; View region statistics via a web page
+    ; See http://opensimulator.org/wiki/FAQ#Region_Statistics_on_a_Web_Page
+    ; Use a web browser and type in the "Login URI" + "/SStats/"
+    ; For example- http://127.0.0.1:9000/SStats/
+    ; enabled=false
 
 
 [MediaOnAPrim]
     ; Enable media on a prim facilities
     Enabled = true;
 
+
 [NPC]
     ;; Enable Non Player Character (NPC) facilities
     Enabled = false
 
+
 [Terrain]
     InitialTerrain = "pinhead-island"
 
+
 ;; 
 ;; If you are using a simian grid frontend you can enable
 ;; this module to upload tile images for the mapping fn
@@ -1706,15 +1725,17 @@
     MaptileURL = "http://www.mygrid.com/Grid/"
     RefreshTime = 3600
 
+
 ;;
 ;; JsonStore module provides structured store for scripts 
 ;; 
 [JsonStore]
-Enabled = False
+    Enabled = False
+
+    ;; Enable direct access to the SOP dynamic attributes
+    EnableObjectStore = False
+    MaxStringSpace = 0
 
-;; Enable direct access to the SOP dynamic attributes
-EnableObjectStore = False
-MaxStringSpace = 0
 
 ;;
 ;; These are defaults that are overwritten below in [Architecture].
@@ -1729,24 +1750,29 @@ MaxStringSpace = 0
     ; asset store each time the region starts
     AssetLoaderEnabled = true
 
+
 [GridService]
     ;; default standalone, overridable in StandaloneCommon.ini
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
         
+
 [AutoBackupModule]
-        ;; default is module is disabled at the top level
-        AutoBackupModuleEnabled = false
+    ;; default is module is disabled at the top level
+    AutoBackupModuleEnabled = false
+
 
 [Sounds]
-        ;; {Module} {} {Implementation of ISoundModule to use.} {OpenSim.Region.CoreModules.dll:SoundModule}
-        Module = OpenSim.Region.CoreModules.dll:SoundModule
+    ;; {Module} {} {Implementation of ISoundModule to use.} {OpenSim.Region.CoreModules.dll:SoundModule}
+    Module = OpenSim.Region.CoreModules.dll:SoundModule
+
+    ;; {MaxDistance} {} {Cut-off distance at which sounds will not be sent to users} {100.0}
+    MaxDistance = 100.0
 
-        ;; {MaxDistance} {} {Cut-off distance at which sounds will not be sent to users} {100.0}
-        MaxDistance = 100.0
 
 [ServiceThrottle]
     ;; Default time interval (in ms) for the throttle service thread to wake up
     Interval = 5000
 
+
 [Modules]
     Include-modules = "addon-modules/*/config/*.ini"