Merge branch 'master' into careminster-presence-refactor

2 files changed, 6 insertions, 0 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 05358c4..82267ed 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -147,6 +147,12 @@
     ; to false if you have compatibility problems.
     ;CacheSculptMaps = true
     
+    ; if you use Meshmerizer and want collisions for meshies, setting this to true
+    ; will cause OpenSim to attempt to decode meshies assets, extract the physics
+    ; mesh, and use it for collisions. This is currently experimental code and enabling
+    ; it may cause unexpected physics problems.
+    ;UseMeshiesPhysicsMesh = false
+    
     ; Choose one of the physics engines below
     ; OpenDynamicsEngine is by some distance the most developed physics engine
     ; basicphysics effectively does not model physics at all, making all objects phantom
diff --git a/bin/zlib.net.dll b/bin/zlib.net.dll
new file mode 100644
index 0000000..9d15654
--- /dev/null
+++ b/bin/zlib.net.dll