aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
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/OdePlugin/ODEPrim.cs
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/OdePlugin/ODEPrim.cs')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs5
1 files changed, 5 insertions, 0 deletions
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 }