1 files changed, 32 insertions, 4 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 554aafa..109793a 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -85,8 +85,8 @@
     ;; 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
+    ; Maximum size of non physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file (as NonPhysicalPrimMax!).
+    NonPhysicalPrimMax = 256
 
     ; Maximum size of physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file.
     PhysicalPrimMax = 10
@@ -94,6 +94,10 @@
     ; If a viewer attempts to rez a prim larger than the non-physical or physical prim max, clamp the dimensions to the appropriate maximum
     ; This can be overriden in the region config file.
     ClampPrimSize = false
+        
+    ; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero.
+    ; This can be overriden in the region config file.
+    LinksetPrims = 0
 
     ; Allow scripts to keep running when they cross region boundaries, rather than being restarted.  State is reloaded on the destination region.
     ; This only applies when crossing to a region running in a different simulator.  
@@ -669,8 +673,7 @@
     ; If true, avatar appearance information is resent to other avatars in the simulator every 60 seconds.
     ; This may help with some situations where avatars are persistently grey, though it will not help 
     ; in other situations (e.g. appearance baking failures where the avatar only appears as a cloud to others).
-    ; This setting is experimental.
-    ResendAppearanceUpdates = false
+    ResendAppearanceUpdates = true
 
 
 [Attachments]
@@ -693,6 +696,24 @@
     ;LevelUpload = 0
 
 
+[Textures]
+    ; If true, textures generated dynamically (i.e. through osSetDynamicTextureData() and similar OSSL functions) are reused where possible
+    ; Chiefly, reuse occurs if a texture has already been generated with identical data and settings, and that texture contains no dynamic components
+    ; (e.g. images pulled from an external HTTP address).
+    ; Reusing previously generated textures results in a much faster update on the viewer but may cause issues if the viewer didn't receive all resolutions of the texture.
+    ; Currently, it will also increase asset cache use since temporary dynamic textures are no longer deleted.
+    ; Hence, currently considered experimental.
+    ; Default is false.
+    ReuseDynamicTextures = false
+
+    ; If true, then textures generated dynamically that have a low data size relative to their pixel size are not reused
+    ; This is to workaround an apparent LL 3.3.4 and earlier viewer bug where such textures are not redisplayed properly when pulled from the viewer cache.
+    ; Only set this to true if you are sure that all the viewers using your simulator will not suffer from this problem.
+    ; This setting only has an affect is ReuseDynamicTextures = true
+    ; Default is false
+    ReuseDynamicLowDataTextures = false
+
+
 [ODEPhysicsSettings]
     ; ## 
     ; ## Physics stats settings
@@ -931,6 +952,9 @@
 
     ; level of detail for physical meshes. 32,16,8 or 4 with 32 being full detail
     MeshLevelOfDetail = 8
+    ; if mesh size is > threshold meters, we need to add more detail because people will notice
+    MeshLevelOfDetailMegaPrimThreshold = 10
+    MeshLevelOfDetailMegaPrim = 16
     ; number^2 non-physical level of detail of the sculpt texture.  32x32 - 1024 verticies
     SculptLevelOfDetail = 32
 
@@ -1600,6 +1624,10 @@
 [Terrain]
     InitialTerrain = "pinhead-island"
 
+[TOSModule]
+    ;; Enable TOS facilities
+    Enabled = false
+
 ;; 
 ;; If you are using a simian grid frontend you can enable
 ;; this module to upload tile images for the mapping fn