diff options
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 | } |