Merge branch 'master' into careminster-presence-refactor

1 files changed, 7 insertions, 0 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 3c4ceb9..252ab8b 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -453,6 +453,13 @@
     ; ForwardOfflineGroupMessages = true
 
 
+[Inventory]
+    ; Control whether multiple objects sent to inventory should be coaleseced into a single item
+    ; There are still some issues with coalescence, including the fact that rotation is not restored
+    ; and some assets may be missing from archive files.
+    CoalesceMultipleObjectsToInventory = true
+
+
 [ODEPhysicsSettings]
     ;##
     ;## World Settings