aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index ad03cc8..e92e97b 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -299,8 +299,6 @@ namespace OpenSim.Region.Physics.Meshing
299 Face f = new Face(v1, v2, v3); 299 Face f = new Face(v1, v2, v3);
300 faces.Add(f); 300 faces.Add(f);
301 } 301 }
302
303 return;
304 } 302 }
305 303
306 private Mesh CreateMeshFromPrimMesher(string primName, PrimitiveBaseShape primShape, Vector3 size, float lod) 304 private Mesh CreateMeshFromPrimMesher(string primName, PrimitiveBaseShape primShape, Vector3 size, float lod)
@@ -361,7 +359,7 @@ namespace OpenSim.Region.Physics.Meshing
361 physicsParms = (OSDMap)map["physics_shape"]; // old asset format 359 physicsParms = (OSDMap)map["physics_shape"]; // old asset format
362 else if (map.ContainsKey("physics_mesh")) 360 else if (map.ContainsKey("physics_mesh"))
363 physicsParms = (OSDMap)map["physics_mesh"]; // new asset format 361 physicsParms = (OSDMap)map["physics_mesh"]; // new asset format
364 362
365 if (physicsParms == null) 363 if (physicsParms == null)
366 { 364 {
367 m_log.Warn("[MESH]: no recognized physics mesh found in mesh asset"); 365 m_log.Warn("[MESH]: no recognized physics mesh found in mesh asset");