aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Meshing
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-11-28 02:01:04 +0000
committerJustin Clark-Casey (justincc)2012-11-28 02:01:04 +0000
commitaae76f7be4f62db230bf4750496b913b6d013eb8 (patch)
treebd7e0a92576ffb7cba577e59e5ec758ae079a906 /OpenSim/Region/Physics/Meshing
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-aae76f7be4f62db230bf4750496b913b6d013eb8.zip
opensim-SC_OLD-aae76f7be4f62db230bf4750496b913b6d013eb8.tar.gz
opensim-SC_OLD-aae76f7be4f62db230bf4750496b913b6d013eb8.tar.bz2
opensim-SC_OLD-aae76f7be4f62db230bf4750496b913b6d013eb8.tar.xz
Stop logging spurious asset data for {0} is zero length error for sculpts/mesh
ODEPrim, for instance, always hits this code path twice at the moment Firstly before any sculpt data has been loaded (hence the spurious message) Secondly when any sculpt data has been loaded or failed to load (when the message would be valid). Hence comment this out and rely on the message in ODEPrim.MeshAssetReceived() instead (though this is not ideal since it requires all physics plugins to copy/paste similar code).
Diffstat (limited to 'OpenSim/Region/Physics/Meshing')
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 3bd15ce..6fa91ab 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -321,7 +321,10 @@ namespace OpenSim.Region.Physics.Meshing
321 321
322 if (primShape.SculptData.Length <= 0) 322 if (primShape.SculptData.Length <= 0)
323 { 323 {
324 m_log.ErrorFormat("[MESH]: asset data for {0} is zero length", primName); 324 // XXX: At the moment we can not log here since ODEPrim, for instance, ends up triggering this
325 // method twice - once before it has loaded sculpt data from the asset service and once afterwards.
326 // The first time will always call with unloaded SculptData if this needs to be uploaded.
327// m_log.ErrorFormat("[MESH]: asset data for {0} is zero length", primName);
325 return false; 328 return false;
326 } 329 }
327 330