Merge master into teravuswork

1 files changed, 82 insertions, 28 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 554aafa..ae5e788 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.  
@@ -419,6 +423,10 @@
     ; " (Mozilla Compatible)" to the text where there are problems with a web server
     ;user_agent = "OpenSim LSL (Mozilla Compatible)"
 
+    ; OpenSim can send multiple simultaneous requests for services such as asset
+    ; retrieval. However, some versions of mono appear to hang when there are too
+    ; many simultaneous requests, default is 30 and is currently applied only to assets
+    ;MaxRequestConcurrency = 30
 
 [XMLRPC]
     ; ##
@@ -669,8 +677,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 +700,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
@@ -815,6 +840,15 @@
     ; When the avatar flies, it will be moved up by this amount off the ground (in meters)
     minimum_ground_flight_offset = 3.0
 
+    ; Plant avatar.   This reduces the effect of physical contacts with the avatar.
+    ; If you have a group of unruly and rude visitors that bump each other, turn this on to make that less attractive.  
+    ; The avatar still allows a small movement based on the PID settings above.  Stronger PID settings AND this active 
+    ; will lock the avatar in place
+    av_planted = false
+
+    ; No Avatar Avatar Collissions.  This causes avatar to be able to walk through each other as if they're ghosts but still interact with the environment
+    av_av_collisions_off = false
+
     ; ##
     ; ## Object options
     ; ##
@@ -911,10 +945,10 @@
     MaxPersistantManifoldPoolSize = 0
     ShouldDisableContactPoolDynamicAllocation = False
     ShouldForceUpdateAllAabbs = False
-    ShouldRandomizeSolverOrder = False
-    ShouldSplitSimulationIslands = False
+    ShouldRandomizeSolverOrder = True
+    ShouldSplitSimulationIslands = True
     ShouldEnableFrictionCaching = False
-    NumberOfSolverIterations = 0;   
+    NumberOfSolverIterations = 0   
 
     ; Linkset constraint parameters
     LinkConstraintUseFrameOffset = False
@@ -931,6 +965,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
 
@@ -1009,30 +1046,31 @@
     ;default_appearance = default_appearance.xml 
 
 
-[RestPlugins]
-    ; Change this to true to enable REST Plugins. This must be true if you wish to use
-    ; REST Region or REST Asset and Inventory Plugins
-    enabled = false
-    god_key = SECRET
-    prefix = /admin
+; RestPlugins are not currently operational.
+;[RestPlugins]
+;    ; Change this to true to enable REST Plugins. This must be true if you wish to use
+;    ; REST Region or REST Asset and Inventory Plugins
+;    enabled = false
+;    god_key = SECRET
+;    prefix = /admin
 
 
-[RestRegionPlugin]
-    ; Change this to true to enable the REST Region Plugin
-    enabled = false
+;[RestRegionPlugin]
+;    ; Change this to true to enable the REST Region Plugin
+;    enabled = false
 
 
-[RestHandler]
-    ; Change this to true to enable the REST Asset and Inventory Plugin
-    enabled = false
-    authenticate = true
-    secured = true
-    extended-escape = true
-    realm = OpenSim REST
-    dump-asset = false
-    path-fill = true
-    dump-line-size = 32
-    flush-on-error = true
+;[RestHandler]
+;    ; Change this to true to enable the REST Asset and Inventory Plugin
+;    enabled = false
+;    authenticate = true
+;    secured = true
+;    extended-escape = true
+;    realm = OpenSim REST
+;    dump-asset = false
+;    path-fill = true
+;    dump-line-size = 32
+;    flush-on-error = true
 
 
 ; IRC bridge is experimental, so if it breaks... keep both parts... yada yada
@@ -1535,6 +1573,11 @@
     ;MessagingModule = GroupsMessagingModule
     ;MessagingEnabled = true 
 
+    ; Experimental option to only message cached online users rather than all users
+    ; Should make large group with few online members messaging faster, as the expense of more calls to ROBUST presence service
+    ; This currently only applies to the Flotsam XmlRpc backend
+    MessageOnlineUsersOnly = false
+
     ; Service connectors to the Groups Service.  Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
   
     ; SimianGrid Service for Groups
@@ -1560,10 +1603,14 @@
 
 
 [PacketPool]
-    ; Enables the experimental packet pool. Yes, we've been here before.
     ;RecyclePackets = true;
     ;RecycleDataBlocks = true;
 
+    ; If true, then the basic packet objects used to receive data are also recycled, not just the LLUDP packets.
+    ; This reduces data churn
+    ; This setting is currently experimental and defaults to false.
+    RecycleBaseUDPPackets = false;
+
 
 [InterestManagement]
      ; This section controls how state updates are prioritized for each client
@@ -1636,5 +1683,12 @@ Enabled = 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
+
+        ;; {MaxDistance} {} {Cut-off distance at which sounds will not be sent to users} {100.0}
+        MaxDistance = 100.0
+
 [Modules]
     Include-modules = "addon-modules/*/config/*.ini"