aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSimDefaults.ini17
1 files changed, 13 insertions, 4 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 107e859..e72e851 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -155,10 +155,6 @@
155 ; it may cause unexpected physics problems. 155 ; it may cause unexpected physics problems.
156 ;UseMeshiesPhysicsMesh = false 156 ;UseMeshiesPhysicsMesh = false
157 157
158 ; enable / disable Collada mesh support
159 ; default is true
160 ; ColladaMesh = true
161
162 ; Choose one of the physics engines below 158 ; Choose one of the physics engines below
163 ; OpenDynamicsEngine is by some distance the most developed physics engine 159 ; OpenDynamicsEngine is by some distance the most developed physics engine
164 ; basicphysics effectively does not model physics at all, making all objects phantom 160 ; basicphysics effectively does not model physics at all, making all objects phantom
@@ -453,6 +449,19 @@
453 ; ForwardOfflineGroupMessages = true 449 ; ForwardOfflineGroupMessages = true
454 450
455 451
452[Inventory]
453 ; Control whether multiple objects sent to inventory should be coaleseced into a single item
454 ; There are still some issues with coalescence, including the fact that rotation is not restored
455 ; and some assets may be missing from archive files.
456 CoalesceMultipleObjectsToInventory = true
457
458
459[Mesh]
460 ; enable / disable Collada mesh support
461 ; default is true
462 ; ColladaMesh = true
463
464
456[ODEPhysicsSettings] 465[ODEPhysicsSettings]
457 ;## 466 ;##
458 ;## World Settings 467 ;## World Settings