Merge branch 'master' into careminster-presence-refactor

2026-08-10 03:06:05 +08:00 · 2011-04-18 21:04:09 +01:00
parent d1913f2429 5a404a9ab1
commit ccf63a9c63
3 changed files with 56 additions and 17 deletions
--- 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