Passes prim physical status to mesher from physics plugins

Small prims now get a full mesh if they are physical
Fixed a logic bug that was preventing many prim meshes from having excess memory cleaned up
Switched to more conservative method of vertex and triangle list trimming to prevent possible crash

1 files changed, 17 insertions, 15 deletions

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 42b6a90..045a25d 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -2178,30 +2178,32 @@ namespace OpenSim.Region.Physics.Meshing
             //}
 
             if (mesh != null)
-                if (size.X < minSizeForComplexMesh && size.Y < minSizeForComplexMesh && size.Z < minSizeForComplexMesh)
+            {
+                if ((!isPhysical) && size.X < minSizeForComplexMesh && size.Y < minSizeForComplexMesh && size.Z < minSizeForComplexMesh)
                 {
 #if SPAM
                 Console.WriteLine("Meshmerizer: prim " + primName + " has a size of " + size.ToString() + " which is below threshold of " + minSizeForComplexMesh.ToString() + " - creating simple bounding box" );
 #endif
                     mesh = CreateBoundingBoxMesh(mesh);
                     mesh.DumpRaw(baseDir, primName, "Z extruded");
+                }
 
-                    // trim the vertex and triangle lists to free up memory
-                    //mesh.vertices.TrimExcess();
-                    //mesh.triangles.TrimExcess();
+                // trim the vertex and triangle lists to free up memory
+                mesh.vertices.TrimExcess();
+                mesh.triangles.TrimExcess();
 
-                    int vertCount = 0;
-                    foreach (Vertex v in mesh.vertices)
-                        if (v != null)
-                            vertCount++;
-                    mesh.vertices.Capacity = vertCount;
+                //int vertCount = 0;
+                //foreach (Vertex v in mesh.vertices)
+                //    if (v != null)
+                //        vertCount++;
+                //mesh.vertices.Capacity = vertCount;
 
-                    int triCount = 0;
-                    foreach (Triangle t in mesh.triangles)
-                        if ( t != null )
-                            triCount++;
-                    mesh.triangles.Capacity = triCount;
-                }
+                //int triCount = 0;
+                //foreach (Triangle t in mesh.triangles)
+                //    if (t != null)
+                //        triCount++;
+                //mesh.triangles.Capacity = triCount;
+            }
 
             return mesh;
         }