From 81a6c397811c587cd97b5bb0f186fe6e799f865b Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 24 May 2013 16:20:26 -0700
Subject: Meshmerizer: add INI parameter to enable DEBUG mesh detail logging.
 Default to off. To turn mesh parsing DEBUG detail logging on, add     [Mesh] 
        LogMeshDetail=true to the INI file.

---
 OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Physics/Meshing/Meshmerizer.cs')

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 2c10568..1b499d0 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Region.Physics.Meshing
         private const string baseDir = null; //"rawFiles";
 #endif
         // If 'true', lots of DEBUG logging of asset parsing details
-        private bool debugDetail = true;
+        private bool debugDetail = false;
 
         private bool cacheSculptMaps = true;
         private string decodedSculptMapPath = null;
@@ -94,8 +94,11 @@ namespace OpenSim.Region.Physics.Meshing
 
             decodedSculptMapPath = start_config.GetString("DecodedSculptMapPath","j2kDecodeCache");
             cacheSculptMaps = start_config.GetBoolean("CacheSculptMaps", cacheSculptMaps);
-            if(mesh_config != null)
+            if (mesh_config != null)
+            {
                 useMeshiesPhysicsMesh = mesh_config.GetBoolean("UseMeshiesPhysicsMesh", useMeshiesPhysicsMesh);
+                debugDetail = mesh_config.GetBoolean("LogMeshDetails", debugDetail);
+            }
 
             try
             {
@@ -415,7 +418,7 @@ namespace OpenSim.Region.Physics.Meshing
 
                             if (debugDetail)
                             {
-                                string keys = "[MESH]: keys found in convexBlock: ";
+                                string keys = LogHeader + " keys found in convexBlock: ";
                                 foreach (KeyValuePair<string, OSD> kvp in convexBlock)
                                     keys += "'" + kvp.Key + "' ";
                                 m_log.Debug(keys);
-- 
cgit v1.1


From 182137263412fb23f9bdb250afbe1b1509280aac Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 24 May 2013 16:32:19 -0700
Subject: Meshmerizer: remember to add the copied hull verts to the list of
 hulls.

---
 OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenSim/Region/Physics/Meshing/Meshmerizer.cs')

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 1b499d0..fc679e7 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -893,6 +893,7 @@ namespace OpenSim.Region.Physics.Meshing
                 List<Vector3> verts = new List<Vector3>();
                 foreach (var vert in hull)
                     verts.Add(vert * size);
+                hulls.Add(verts);
             }
 
             return hulls;
-- 
cgit v1.1