Merge branch 'master' into httptests

bin/OpenSimDefaults.ini

@@ -949,18 +949,35 @@
 
 
 [Mesh]
-    ; enable / disable Collada mesh support
+    ; enable / disable mesh asset uploads
+    ; mesh asset must conform to standard mesh format, with OpenSim extensions
     ; default is true
     AllowMeshUpload = true
 
-    ; if you use Meshmerizer and want collisions for meshies, setting this to true
-    ; will cause OpenSim to attempt to decode meshies assets, extract the physics
-    ; mesh, and use it for collisions. 
-    UseMeshiesPhysicsMesh = true
-
     ; Minimum user level required to upload meshes
     ;LevelUpload = 0
 
+    ; support meshes on physics
+    ;UseMeshiesPhysicsMesh = true
+
+    ;support convex shape type on normal prims
+    ; (ubOde only)
+    ;ConvexPrims = true
+    
+    ;support convex shape type on sculpts
+    ; (ubOde only)
+    ;ConvexSculpts = true
+    
+    ; mesh cache settings:
+    ; (ubOde only)
+    ; do cache (keep true)
+    ;MeshFileCache = true
+    ; cache folder name relative to bin/ or absolute path
+    ;MeshFileCachePath = MeshCache
+    ;MeshFileCacheDoExpire = true;
+    ;MeshFileCacheExpireHours = 48
+    
+
 
 [Textures]
     ; If true, textures generated dynamically (i.e. through osSetDynamicTextureData() and similar OSSL functions) are reused where possible
@@ -982,7 +999,7 @@
 
 [ODEPhysicsSettings]
     ; ## 
-    ; ## Physics stats settings
+    ; ## Physics stats settings ( most ignored by ubOde )
     ;
 
     ; If collect_stats is enabled, then extra stat information is collected which is accessible via the MonitorModule
@@ -1155,12 +1172,14 @@
     ; ## additional meshing options
     ; ##
 
-    ; Physical collision mesh proxies are normally created for complex prim shapes,
-    ;   and collisions for simple boxes and spheres are computed algorithmically.
-    ;   If you would rather have mesh proxies for simple prims, you can set this to
-    ;   true. Note that this will increase memory usage and region startup time.
-    ; Default is false.
-    ;force_simple_prim_meshing = false
+    ; Physics needs to create internal meshs (or convert the object meshs or scultps)
+    ; for all prims except simple boxes and spheres.
+    
+    ; collisions of small objects againts larger ones can have a increased CPU load cost
+    ; so this are represented by a simple BOX
+    ; if all their scale dimensions are lower or equal to this option. Default is 0.1m
+    ; (ubOde only)
+    ; MinSizeToMeshmerize = 0.1
 
 
 [BulletSim]
@@ -1469,7 +1488,7 @@
     
     ; active_trees allows module to change its trees in time.
     ; some will be deleted, others created and rest may grow
-    ; default is false. You can change it with console comand tree active true | false later
+    ; default is false. You can change it with console command tree active true | false later
     active_trees = false
     ; the trees change execution time rate (in ms)
     update_rate = 1000 
@@ -2061,7 +2080,7 @@
     ;XmlRpcServiceWriteKey   = 1234 
 
     ; Disables HTTP Keep-Alive for XmlRpcGroupsServicesConnector HTTP Requests,
-	; only set to false it if you absolute sure regions and groups server suport it.
+	; only set to false it if you absolute sure regions and groups server support it.
     ; XmlRpcDisableKeepAlive = true
 
     ; Minimum user level required to create groups