1 files changed, 37 insertions, 24 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index ca4fbfb..cd69e2a 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -70,6 +70,10 @@
     ; except that everything is also enclosed in a <Regions> tag.
     ; regionload_webserver_url = "http://example.com/regions.xml";
 
+    ;; Allow the simulator to start up if there are no region configuration available
+    ;; from the selected region_info_source.
+    allow_regionless = false
+
     ; Maximum size of non physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file (as NonphysicalPrimMax!).
     NonPhysicalPrimMax = 256
 
@@ -511,6 +515,7 @@
         ; so it is disabled by default.
     Cap_WebFetchInventoryDescendents = ""
 
+
 [Chat]
     ; Controls whether the chat module is enabled.  Default is true.
     enabled = true;
@@ -524,6 +529,7 @@
     ; Distance in meters that shouts should travel.  Default is 100m
     shout_distance = 100
 
+
 [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
@@ -550,6 +556,12 @@
     CoalesceMultipleObjectsToInventory = true
 
 
+[Attachments]
+    ; Controls whether avatar attachments are enabled.
+    ; Defaults to true - only set to false for debugging purposes
+    Enabled = true
+
+
 [Mesh]
     ; enable / disable Collada mesh support
     ; default is true
@@ -1124,6 +1136,25 @@
     ; Threat level to allow, one of None, VeryLow, Low, Moderate, High, VeryHigh, Severe
     OSFunctionThreatLevel = VeryLow
 
+    ; OS Functions enable/disable
+    ; For each function, you can add one line, as shown
+    ; The default for all functions allows them if below threat level
+
+    ; true allows the use of the function unconditionally
+    ; Allow_osSetRegionWaterHeight = true
+
+    ; false disables the function completely
+    ; Allow_osSetRegionWaterHeight = false
+
+    ; Comma separated list of UUIDS allows the function for that list of UUIDS
+    ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb
+
+    ; You can also use script creators as the uuid
+    ; Creators_osSetRegionWaterHeight = <uuid>, ...
+
+    ; If both Allow_ and Creators_ are given, effective permissions
+    ; are the union of the two.
+
     ; Interval (s) between background save of script states
     SaveInterval = 120
 
@@ -1151,25 +1182,6 @@
     SensorMaxRange = 96.0
     SensorMaxResults = 16
 
-    ; OS Functions enable/disable
-    ; For each function, you can add one line, as shown
-    ; The default for all functions allows them if below threat level
-
-    ; true allows the use of the function unconditionally
-    ; Allow_osSetRegionWaterHeight = true
-
-    ; false disables the function completely
-    ; Allow_osSetRegionWaterHeight = false
-
-    ; Comma separated list of UUIDS allows the function for that list of UUIDS
-    ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb
-
-    ; You can also use script creators as the uuid
-    ; Creators_osSetRegionWaterHeight = <uuid>, ...
-
-    ; If both Allow_ and Creators_ are given, effective permissions
-    ; are the union of the two.
-
     ; Allow for llCreateLink and llBreakLink to work without asking for permission
     ; only enable this in a trusted environment otherwise you may be subject to hijacking
     ; AutomaticLinkPermission = false
@@ -1182,11 +1194,12 @@
     ;; Path to script assemblies 
     ; ScriptEnginesPath = "ScriptEngines"
 
-    ; Whether to delete previously compiled scripts when the sim starts. If you disable this
-    ; then startup will be faster. However, then it becomes your responsibility to delete the
-    ; compiled scripts if OpenSim has changed enough that previously compiled scripts are no
-    ; longer compatible.
-    DeleteScriptsOnStartup = true 
+    ; Controls whether previously compiled scripts are deleted on sim restart. If you disable this 
+    ; then startup will be faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the 
+    ; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used
+    ; by scripts have changed.
+    ; Default is false
+    ; DeleteScriptsOnStartup = true
 
 
 [OpenGridProtocol]