diff options
| author | Melanie Thielker | 2017-02-01 16:34:49 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2017-02-01 16:34:49 +0000 |
| commit | 202fcc7d6fb94622cec208b9165e4effda60501c (patch) | |
| tree | d224c59768dad96e2b524bc3a1c3c0078816e046 /OpenSim/Region/PhysicsModules | |
| parent | update parcel select or sat on stats on sit and stand (diff) | |
| parent | Refactor part II (diff) | |
| download | opensim-SC-202fcc7d6fb94622cec208b9165e4effda60501c.zip opensim-SC-202fcc7d6fb94622cec208b9165e4effda60501c.tar.gz opensim-SC-202fcc7d6fb94622cec208b9165e4effda60501c.tar.bz2 opensim-SC-202fcc7d6fb94622cec208b9165e4effda60501c.tar.xz | |
Merge branch 'melanie'
Diffstat (limited to 'OpenSim/Region/PhysicsModules')
| -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 163f439..0117800 100644 --- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs +++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs | |||
| @@ -454,7 +454,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing | |||
| 454 | 454 | ||
| 455 | if (physicsParms == null) | 455 | if (physicsParms == null) |
| 456 | { | 456 | { |
| 457 | m_log.WarnFormat("[MESH]: unknown mesh type for prim {0}",primName); | 457 | //m_log.WarnFormat("[MESH]: unknown mesh type for prim {0}",primName); |
| 458 | return false; | 458 | return false; |
| 459 | } | 459 | } |
| 460 | 460 | ||
| @@ -712,7 +712,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing | |||
| 712 | else | 712 | else |
| 713 | { | 713 | { |
| 714 | // if neither mesh or decomposition present, warn and use convex | 714 | // if neither mesh or decomposition present, warn and use convex |
| 715 | m_log.WarnFormat("[MESH]: Data for PRIM shape type ( mesh or decomposition) not found for prim {0}",primName); | 715 | //m_log.WarnFormat("[MESH]: Data for PRIM shape type ( mesh or decomposition) not found for prim {0}",primName); |
| 716 | } | 716 | } |
| 717 | } | 717 | } |
| 718 | vs.Clear(); | 718 | vs.Clear(); |