aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs')
-rw-r--r--OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs16
1 files changed, 11 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs b/OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs
index fabadd3..dec5eb7 100644
--- a/OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs
@@ -993,12 +993,12 @@ namespace OpenSim.Region.Physics.Meshing
993 993
994 public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod) 994 public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod)
995 { 995 {
996 return CreateMesh(primName, primShape, size, lod, false,false); 996 return CreateMesh(primName, primShape, size, lod, false,false,false);
997 } 997 }
998 998
999 public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical) 999 public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical)
1000 { 1000 {
1001 return CreateMesh(primName, primShape, size, lod, false,false); 1001 return CreateMesh(primName, primShape, size, lod, false,false,false);
1002 } 1002 }
1003 1003
1004 private static Vector3 m_MeshUnitSize = new Vector3(0.5f, 0.5f, 0.5f); 1004 private static Vector3 m_MeshUnitSize = new Vector3(0.5f, 0.5f, 0.5f);
@@ -1039,7 +1039,7 @@ namespace OpenSim.Region.Physics.Meshing
1039 return null; 1039 return null;
1040 } 1040 }
1041 1041
1042 public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool convex) 1042 public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool convex, bool forOde)
1043 { 1043 {
1044#if SPAM 1044#if SPAM
1045 m_log.DebugFormat("[MESH]: Creating mesh for {0}", primName); 1045 m_log.DebugFormat("[MESH]: Creating mesh for {0}", primName);
@@ -1094,8 +1094,14 @@ namespace OpenSim.Region.Physics.Meshing
1094 mesh.DumpRaw(baseDir, primName, "Z extruded"); 1094 mesh.DumpRaw(baseDir, primName, "Z extruded");
1095 } 1095 }
1096 1096
1097 // trim the vertex and triangle lists to free up memory 1097 if (forOde)
1098 mesh.TrimExcess(); 1098 {
1099 // force pinned mem allocation
1100 mesh.PrepForOde();
1101 }
1102 else
1103 mesh.TrimExcess();
1104
1099 mesh.Key = key; 1105 mesh.Key = key;
1100 mesh.RefCount = 1; 1106 mesh.RefCount = 1;
1101 1107