diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEModule.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEModule.cs
index 4508f47519..ed9c85921b 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEModule.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEModule.cs
@@ -7,6 +7,7 @@ using Mono.Addins;
using OpenSim.Framework;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Interfaces;
+using OpenMetaverse;
namespace OpenSim.Region.PhysicsModule.ubOde
{
@@ -55,8 +56,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
//throw new Exception("Invalid physics meshing option");
}
- if (Util.IsWindows())
- Util.LoadArchSpecificWindowsDll("ubode.dll");
+ DllmapConfigHelper.RegisterAssembly(typeof(ubOdeModule).Assembly);
UBOdeNative.InitODE();
diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
index 68a9b7cba5..00733f35be 100644
--- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
+++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
@@ -733,9 +733,9 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
return false;
}
}
- catch (DllNotFoundException)
+ catch (DllNotFoundException e)
{
- m_log.Error("[PHYSICS]: OpenJpeg is not installed correctly on this system. Physics Proxy generation failed. Often times this is because of an old version of GLIBC. You must have version 2.4 or above!");
+ m_log.Error($"[PHYSICS]: OpenJpeg problem: {e.Message}");
return false;
}
catch (IndexOutOfRangeException)
diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
index 3ef74d5591..76524ed9b3 100755
Binary files a/bin/OpenMetaverse.Rendering.Meshmerizer.dll and b/bin/OpenMetaverse.Rendering.Meshmerizer.dll differ
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index 4f102de750..d35ffe1c97 100755
Binary files a/bin/OpenMetaverse.StructuredData.dll and b/bin/OpenMetaverse.StructuredData.dll differ
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index 2b90cb97d1..4d18ce642b 100755
Binary files a/bin/OpenMetaverse.dll and b/bin/OpenMetaverse.dll differ
diff --git a/bin/OpenMetaverse.dll.config b/bin/OpenMetaverse.dll.config
index a06109b49c..20b1df5ec3 100644
--- a/bin/OpenMetaverse.dll.config
+++ b/bin/OpenMetaverse.dll.config
@@ -1,10 +1,9 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index b34241cebf..b62042680f 100755
Binary files a/bin/OpenMetaverseTypes.dll and b/bin/OpenMetaverseTypes.dll differ
diff --git a/bin/OpenSim.Region.PhysicsModule.ubOde.dll.config b/bin/OpenSim.Region.PhysicsModule.ubOde.dll.config
index d71fd7dc6e..332fe763ad 100644
--- a/bin/OpenSim.Region.PhysicsModule.ubOde.dll.config
+++ b/bin/OpenSim.Region.PhysicsModule.ubOde.dll.config
@@ -1,5 +1,6 @@
-
-
+
+
+
diff --git a/bin/libopenjpeg-dotnet-x86_64.so b/bin/libopenjpeg-dotnet-x86_64.so
deleted file mode 100644
index 7a9bdfcd1d..0000000000
Binary files a/bin/libopenjpeg-dotnet-x86_64.so and /dev/null differ
diff --git a/bin/libubode.dylib b/bin/libubode.dylib
deleted file mode 100644
index a5f528f422..0000000000
Binary files a/bin/libubode.dylib and /dev/null differ
diff --git a/bin/libubode.so b/bin/libubode.so
deleted file mode 100644
index b6581d2bf2..0000000000
Binary files a/bin/libubode.so and /dev/null differ
diff --git a/bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1-aarch64.so b/bin/openjpeg-dotnet-arm64.so
old mode 100755
new mode 100644
similarity index 100%
rename from bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1-aarch64.so
rename to bin/openjpeg-dotnet-arm64.so
diff --git a/bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1-i686.so b/bin/openjpeg-dotnet-x86.so
similarity index 100%
rename from bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1-i686.so
rename to bin/openjpeg-dotnet-x86.so
diff --git a/bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1-x86_64.so b/bin/openjpeg-dotnet-x86_64.so
similarity index 100%
rename from bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1-x86_64.so
rename to bin/openjpeg-dotnet-x86_64.so
diff --git a/bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1.dylib b/bin/openjpeg-dotnet.dylib
similarity index 100%
rename from bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1.dylib
rename to bin/openjpeg-dotnet.dylib
diff --git a/bin/ubode.dll b/bin/ubode.dll
deleted file mode 100644
index 13ebcf918c..0000000000
Binary files a/bin/ubode.dll and /dev/null differ