diff options
author | UbitUmarov | 2016-08-19 03:05:25 +0100 |
---|---|---|
committer | UbitUmarov | 2016-08-19 03:05:25 +0100 |
commit | 7ba3fb7b5d9c883b7a99d19f893ff6d43689b629 (patch) | |
tree | 1ea4937e30520d440979ab02e92882f6f54a3e73 /OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs | |
parent | fix entity update flags update (diff) | |
parent | catch some NULL refs (diff) | |
download | opensim-SC-7ba3fb7b5d9c883b7a99d19f893ff6d43689b629.zip opensim-SC-7ba3fb7b5d9c883b7a99d19f893ff6d43689b629.tar.gz opensim-SC-7ba3fb7b5d9c883b7a99d19f893ff6d43689b629.tar.bz2 opensim-SC-7ba3fb7b5d9c883b7a99d19f893ff6d43689b629.tar.xz |
merge issue
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs index bcf8e2b..6e43cf8 100644 --- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs +++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs | |||
@@ -417,7 +417,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing | |||
417 | meshOsd = (OSDMap)osd; | 417 | meshOsd = (OSDMap)osd; |
418 | else | 418 | else |
419 | { | 419 | { |
420 | m_log.Warn("[Mesh}: unable to cast mesh asset to OSDMap"); | 420 | m_log.WarnFormat("[Mesh}: unable to cast mesh asset to OSDMap prim: {0}",primName); |
421 | return false; | 421 | return false; |
422 | } | 422 | } |
423 | } | 423 | } |
@@ -451,7 +451,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing | |||
451 | 451 | ||
452 | if (physicsParms == null) | 452 | if (physicsParms == null) |
453 | { | 453 | { |
454 | m_log.Warn("[MESH]: unknown mesh type"); | 454 | m_log.WarnFormat("[MESH]: unknown mesh type for {0}",primName); |
455 | return false; | 455 | return false; |
456 | } | 456 | } |
457 | 457 | ||