diff options
Merge branch 'master' into careminster
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index 91339d2..16d65eb 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |||
@@ -74,7 +74,7 @@ namespace OpenSim.Region.Physics.Meshing | |||
74 | private const string baseDir = null; //"rawFiles"; | 74 | private const string baseDir = null; //"rawFiles"; |
75 | #endif | 75 | #endif |
76 | // If 'true', lots of DEBUG logging of asset parsing details | 76 | // If 'true', lots of DEBUG logging of asset parsing details |
77 | private bool debugDetail = true; | 77 | private bool debugDetail = false; |
78 | 78 | ||
79 | private bool cacheSculptMaps = true; | 79 | private bool cacheSculptMaps = true; |
80 | private string decodedSculptMapPath = null; | 80 | private string decodedSculptMapPath = null; |
@@ -94,8 +94,11 @@ namespace OpenSim.Region.Physics.Meshing | |||
94 | 94 | ||
95 | decodedSculptMapPath = start_config.GetString("DecodedSculptMapPath","j2kDecodeCache"); | 95 | decodedSculptMapPath = start_config.GetString("DecodedSculptMapPath","j2kDecodeCache"); |
96 | cacheSculptMaps = start_config.GetBoolean("CacheSculptMaps", cacheSculptMaps); | 96 | cacheSculptMaps = start_config.GetBoolean("CacheSculptMaps", cacheSculptMaps); |
97 | if(mesh_config != null) | 97 | if (mesh_config != null) |
98 | { | ||
98 | useMeshiesPhysicsMesh = mesh_config.GetBoolean("UseMeshiesPhysicsMesh", useMeshiesPhysicsMesh); | 99 | useMeshiesPhysicsMesh = mesh_config.GetBoolean("UseMeshiesPhysicsMesh", useMeshiesPhysicsMesh); |
100 | debugDetail = mesh_config.GetBoolean("LogMeshDetails", debugDetail); | ||
101 | } | ||
99 | 102 | ||
100 | try | 103 | try |
101 | { | 104 | { |
@@ -415,7 +418,7 @@ namespace OpenSim.Region.Physics.Meshing | |||
415 | 418 | ||
416 | if (debugDetail) | 419 | if (debugDetail) |
417 | { | 420 | { |
418 | string keys = "[MESH]: keys found in convexBlock: "; | 421 | string keys = LogHeader + " keys found in convexBlock: "; |
419 | foreach (KeyValuePair<string, OSD> kvp in convexBlock) | 422 | foreach (KeyValuePair<string, OSD> kvp in convexBlock) |
420 | keys += "'" + kvp.Key + "' "; | 423 | keys += "'" + kvp.Key + "' "; |
421 | m_log.Debug(keys); | 424 | m_log.Debug(keys); |
@@ -890,6 +893,7 @@ namespace OpenSim.Region.Physics.Meshing | |||
890 | List<Vector3> verts = new List<Vector3>(); | 893 | List<Vector3> verts = new List<Vector3>(); |
891 | foreach (var vert in hull) | 894 | foreach (var vert in hull) |
892 | verts.Add(vert * size); | 895 | verts.Add(vert * size); |
896 | hulls.Add(verts); | ||
893 | } | 897 | } |
894 | 898 | ||
895 | return hulls; | 899 | return hulls; |