Merge branch 'opensim:master' into master

2026-08-06 01:06:30 +08:00 · 2024-10-10 01:02:56 +00:00
parent dfd03c01ff cda1c7f1f2
commit a4b5986271
4 changed files with 1 additions and 1 deletions
--- a/bin/OpenSim.Region.PhysicsModule.BulletS.dll.config
+++ b/bin/OpenSim.Region.PhysicsModule.BulletS.dll.config
@@ -1,6 +1,6 @@
 <configuration>
  <dllmap os="windows" cpu="x86-64" dll="BulletSim" target="lib64/BulletSim-3.26-20231207-x86_64.dll" />
-  <dllmap os="osx" dll="BulletSim" target="lib64/libBulletSim.dylib" />
+  <dllmap os="osx" dll="BulletSim" target="lib64/libBulletSim-3.26-20231203-universal.dylib" />
  <dllmap os="!windows,osx" cpu="x86-64" dll="BulletSim" target="lib64/libBulletSim-2.86-20170903-x86_64.so" />
  <dllmap os="!windows,osx" cpu="arm64" dll="BulletSim" target="lib64/libBulletSim-arm64.so" />
 </configuration>
--- a/bin/lib64/libBulletSim-3.26-20231203-universal.dylib
+++ b/bin/lib64/libBulletSim-3.26-20231203-universal.dylib
--- a/bin/lib64/libopenjpeg-dotnet.dylib
+++ b/bin/lib64/libopenjpeg-dotnet.dylib
--- a/bin/lib64/libubode.dylib
+++ b/bin/lib64/libubode.dylib