ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 18:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'melanie'

Browse Source
This commit is contained in:
Melanie Thielker
2017-02-01 16:34:49 +00:00
parent 056ccaed90 60cf3f759f
commit 202fcc7d6f
21 changed files with 158 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
View File

@@ -454,7 +454,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
if (physicsParms == null)
{
m_log.WarnFormat("[MESH]: unknown mesh type for prim {0}",primName);
//m_log.WarnFormat("[MESH]: unknown mesh type for prim {0}",primName);
return false;
}
@@ -712,7 +712,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
else
{
// if neither mesh or decomposition present, warn and use convex
m_log.WarnFormat("[MESH]: Data for PRIM shape type ( mesh or decomposition) not found for prim {0}",primName);
//m_log.WarnFormat("[MESH]: Data for PRIM shape type ( mesh or decomposition) not found for prim {0}",primName);
}
}
vs.Clear();