aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Meshing
diff options
context:
space:
mode:
authorDiva Canto2012-11-27 21:11:19 -0800
committerDiva Canto2012-11-27 21:11:19 -0800
commitd656ec8f33164cb9d202e655bcbc655310d3ed6e (patch)
treec71e56c0eff25855b538be3ebe86138db2c7b271 /OpenSim/Region/Physics/Meshing
parentBug fix in Offline IM for inventory transfers. The items were being placed tw... (diff)
parentStop logging spurious asset data for {0} is zero length error for sculpts/mesh (diff)
downloadopensim-SC_OLD-d656ec8f33164cb9d202e655bcbc655310d3ed6e.zip
opensim-SC_OLD-d656ec8f33164cb9d202e655bcbc655310d3ed6e.tar.gz
opensim-SC_OLD-d656ec8f33164cb9d202e655bcbc655310d3ed6e.tar.bz2
opensim-SC_OLD-d656ec8f33164cb9d202e655bcbc655310d3ed6e.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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