diff options
author | Justin Clark-Casey (justincc) | 2012-11-28 02:01:04 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-11-28 02:01:04 +0000 |
commit | aae76f7be4f62db230bf4750496b913b6d013eb8 (patch) | |
tree | bd7e0a92576ffb7cba577e59e5ec758ae079a906 /OpenSim | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-aae76f7be4f62db230bf4750496b913b6d013eb8.zip opensim-SC-aae76f7be4f62db230bf4750496b913b6d013eb8.tar.gz opensim-SC-aae76f7be4f62db230bf4750496b913b6d013eb8.tar.bz2 opensim-SC-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')
-rw-r--r-- | OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 5 |
2 files changed, 9 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 | ||
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 5a0b8d1..0d66496 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -3361,6 +3361,11 @@ Console.WriteLine(" JointCreateFixed"); | |||
3361 | _pbs.SculptData = new byte[asset.Data.Length]; | 3361 | _pbs.SculptData = new byte[asset.Data.Length]; |
3362 | asset.Data.CopyTo(_pbs.SculptData, 0); | 3362 | asset.Data.CopyTo(_pbs.SculptData, 0); |
3363 | // m_assetFailed = false; | 3363 | // m_assetFailed = false; |
3364 | |||
3365 | // m_log.DebugFormat( | ||
3366 | // "[ODE PRIM]: Received mesh/sculpt data asset {0} with {1} bytes for {2} at {3} in {4}", | ||
3367 | // _pbs.SculptTexture, _pbs.SculptData.Length, Name, _position, _parent_scene.Name); | ||
3368 | |||
3364 | m_taintshape = true; | 3369 | m_taintshape = true; |
3365 | _parent_scene.AddPhysicsActorTaint(this); | 3370 | _parent_scene.AddPhysicsActorTaint(this); |
3366 | } | 3371 | } |