From f29d5ad662387b97d9e881f28df584dc19fa8c07 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 2 Nov 2016 22:33:32 +0000 Subject: [PATCH] ubOde: if a mesh does not contain data for shape type PRIM, dont collide as convex as before but just don't collide matching the type NONE viewers display in this case --- OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs index ff10e7f35b..bcd1530302 100644 --- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs +++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs @@ -443,6 +443,11 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing if (physicsParms != null) usemesh = true; + else + { + m_log.WarnFormat("[MESH]: Data for PRIM shape type not found for prim {0}",primName); + return false; + } } if(!usemesh && (map.ContainsKey("physics_convex"))) @@ -451,7 +456,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing if (physicsParms == null) { - m_log.WarnFormat("[MESH]: unknown mesh type for {0}",primName); + m_log.WarnFormat("[MESH]: unknown mesh type for prim {0}",primName); return false; }