ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 10:15:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

update libomv with new dllmapconfiguration helper. This will read again files *dll.config to setup dllmaps, but does need to be called by hand on respective assemblies. It will also set dllmaps for windows. Change ubode to use it. (cross fingers)

Browse Source
This commit is contained in:
UbitUmarov
2022-11-23 22:16:43 +00:00
parent e5386fba6f
commit 1e49330904
16 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/PhysicsModules/ubOde/ODEModule.cs
View File

@@ -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();

4
OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
View File

@@ -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)