aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODEPrim.cs')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs13
1 files changed, 9 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 2548648..5a0b8d1 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -3335,7 +3335,6 @@ Console.WriteLine(" JointCreateFixed");
3335 m_material = pMaterial; 3335 m_material = pMaterial;
3336 } 3336 }
3337 3337
3338
3339 private void CheckMeshAsset() 3338 private void CheckMeshAsset()
3340 { 3339 {
3341 if (_pbs.SculptEntry && !m_assetFailed && _pbs.SculptTexture != UUID.Zero) 3340 if (_pbs.SculptEntry && !m_assetFailed && _pbs.SculptTexture != UUID.Zero)
@@ -3345,14 +3344,14 @@ Console.WriteLine(" JointCreateFixed");
3345 { 3344 {
3346 RequestAssetDelegate assetProvider = _parent_scene.RequestAssetMethod; 3345 RequestAssetDelegate assetProvider = _parent_scene.RequestAssetMethod;
3347 if (assetProvider != null) 3346 if (assetProvider != null)
3348 assetProvider(_pbs.SculptTexture, MeshAssetReveived); 3347 assetProvider(_pbs.SculptTexture, MeshAssetReceived);
3349 }); 3348 });
3350 } 3349 }
3351 } 3350 }
3352 3351
3353 void MeshAssetReveived(AssetBase asset) 3352 private void MeshAssetReceived(AssetBase asset)
3354 { 3353 {
3355 if (asset.Data != null && asset.Data.Length > 0) 3354 if (asset != null && asset.Data != null && asset.Data.Length > 0)
3356 { 3355 {
3357 if (!_pbs.SculptEntry) 3356 if (!_pbs.SculptEntry)
3358 return; 3357 return;
@@ -3365,6 +3364,12 @@ Console.WriteLine(" JointCreateFixed");
3365 m_taintshape = true; 3364 m_taintshape = true;
3366 _parent_scene.AddPhysicsActorTaint(this); 3365 _parent_scene.AddPhysicsActorTaint(this);
3367 } 3366 }
3367 else
3368 {
3369 m_log.WarnFormat(
3370 "[ODE PRIM]: Could not get mesh/sculpt asset {0} for {1} at {2} in {3}",
3371 _pbs.SculptTexture, Name, _position, _parent_scene.Name);
3372 }
3368 } 3373 }
3369 } 3374 }
3370} \ No newline at end of file 3375} \ No newline at end of file