Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

1 files changed, 61 insertions, 19 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 6fb9787..6d699fd 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -33,6 +33,10 @@
     ; Console commands run every 20 minutes
     ; timer_Script = "filename"
 
+    ; timer_Script time interval (default 20 min)
+    ; The time is 60 per minute
+    ; timer_Interval = 1200
+
     ; ##
     ; ## SYSTEM
     ; ##
@@ -337,6 +341,13 @@
     ; OpenJPEG if false
     ; UseCSJ2K = true
 
+
+    ; Use "Trash" folder for items deleted from the scene
+    ; When set to True (the default) items deleted from the scene will be
+    ; stored in the user's trash or lost and found folder. When set to
+    ; False items will be removed from the scene permanently
+    UseTrashOnDelete = True
+
     ; Persist avatar baked textures
     ; Persisting baked textures can speed up login and region border 
     ; crossings especially with large numbers of users, though it
@@ -527,7 +538,20 @@
     ; silly vanity "Facelights" dead. Sorry, head mounted miner's lamps
     ; will also be affected.
     ;
-    ;DisableFacelights = "false(1815)
+    ;DisableFacelights = false
+
+    ; The time to wait before disconecting an unresponsive client.
+    ; The time is in seconds. The default is one minute
+    ;
+    ;AckTimeout = 60
+
+    ; The time to wait before disconecting an unresponsive paused client.
+    ; A client can be paused when the file selection dialog is open during file upload.
+    ; This gives extra time to find files via the dialog but will still disconnect if
+    ; the client crashes or loses its network connection
+    ; The time is in seconds. The default is five minutes.
+    ;
+    ;PausedAckTimeout = 300
 
 [ClientStack.LindenCaps]
     ;; Long list of capabilities taken from 
@@ -542,6 +566,7 @@
     Cap_CopyInventoryFromNotecard = "localhost"
     Cap_DispatchRegionInfo = ""
     Cap_EstateChangeInfo = ""
+    Cap_EnvironmentSettings = "localhost"
     Cap_EventQueueGet = "localhost"
     Cap_FetchInventory = ""
     Cap_ObjectMedia = "localhost"
@@ -594,13 +619,12 @@
     Cap_ViewerStartAuction = ""
     Cap_ViewerStats = ""
 
-    ; The various fetch inventory caps are supported by OpenSim, but may
-    ; lead to poor sim performance if served by the simulators,
-    ; so they are currently disabled by default.
+    ; Capabilities for fetching inventory over HTTP rather than UDP
     ; FetchInventoryDescendents2 and FetchInventory2 are the ones used in the latest Linden Lab viewers (from some point in the v2 series and above)
+    ; It appears that Linden Lab viewer 3.3.1 onwards will not work properly if FetchInventoryDescendents2 and FetchInventory2 are not enabled
     Cap_WebFetchInventoryDescendents = ""
-    Cap_FetchInventoryDescendents2 = ""
-    Cap_FetchInventory2 = ""
+    Cap_FetchInventoryDescendents2 = "localhost"
+    Cap_FetchInventory2 = "localhost"
     
 
 [Chat]
@@ -668,6 +692,25 @@
 
 
 [ODEPhysicsSettings]
+    ; ## 
+    ; ## Physics stats settings
+    ;
+
+    ; If collect_stats is enabled, then extra stat information is collected which is accessible via the MonitorModule
+    ; (see http://opensimulator.org/wiki/Monitoring_Module for more details).
+    collect_stats = false
+
+    ; ##
+    ; ## Physics logging settings - logfiles are saved to *.DIF files
+    ; ##
+
+    ; default is false
+    ;physics_logging = true
+    ;; every n simulation iterations, the physics snapshot file is updated
+    ;physics_logging_interval = 50
+    ;; append to existing physics logfile, or overwrite existing logfiles?
+    ;physics_logging_append_existing_logfile = true
+
     ;##
     ;## World Settings
     ;##
@@ -817,17 +860,6 @@
     mesh_physical_lod = 16
 
     ; ##
-    ; ## Physics logging settings - logfiles are saved to *.DIF files
-    ; ##
-
-    ; default is false
-    ;physics_logging = true
-    ;; every n simulation iterations, the physics snapshot file is updated
-    ;physics_logging_interval = 50
-    ;; append to existing physics logfile, or overwrite existing logfiles?
-    ;physics_logging_append_existing_logfile = true
-
-    ; ##
     ; ## Joint support
     ; ##
 
@@ -1125,16 +1157,20 @@
     ; currently unused
     ; AllowosConsoleCommand=false
 
+    ; Are god functions such as llSetObjectPermMask() allowed?  If true then gods and only gods have access to these functions.
+    ; If false then gods cannot execute these functions either.
     AllowGodFunctions = false
 
     ; Maximum number of llListen events we allow over the entire region.
     ; Set this to 0 to have no limit imposed
-    max_listeners_per_region = 1000
+    max_listens_per_region = 1000
 
     ; Maximum number of llListen events we allow per script
     ; Set this to 0 to have no limit imposed.
     max_listens_per_script = 64
-
+  
+    ; 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.
@@ -1561,6 +1597,12 @@
     RefreshTime = 3600
 
 ;;
+;; JsonStore module provides structured store for scripts 
+;; 
+[JsonStore]
+Enabled = False
+
+;;
 ;; These are defaults that are overwritten below in [Architecture].
 ;; These defaults allow OpenSim to work out of the box with
 ;; zero configuration