diff options
| author | Melanie | 2012-03-20 23:39:02 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-20 23:39:02 +0000 |
| commit | 35c3124c3badfc7c6e3b0ee1957cb827be678650 (patch) | |
| tree | e245c0080da5acc0b9192208d0a421be865ba2cb /OpenSim/Region/Physics | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add prim name to "[MESH]: No recognized physics mesh..." log message (diff) | |
| download | opensim-SC-35c3124c3badfc7c6e3b0ee1957cb827be678650.zip opensim-SC-35c3124c3badfc7c6e3b0ee1957cb827be678650.tar.gz opensim-SC-35c3124c3badfc7c6e3b0ee1957cb827be678650.tar.bz2 opensim-SC-35c3124c3badfc7c6e3b0ee1957cb827be678650.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Physics')
| -rw-r--r-- | OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index c4b245f..79e50d2 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |||
| @@ -372,7 +372,7 @@ namespace OpenSim.Region.Physics.Meshing | |||
| 372 | 372 | ||
| 373 | if (physicsParms == null) | 373 | if (physicsParms == null) |
| 374 | { | 374 | { |
| 375 | m_log.Warn("[MESH]: no recognized physics mesh found in mesh asset"); | 375 | m_log.WarnFormat("[MESH]: No recognized physics mesh found in mesh asset for {0}", primName); |
| 376 | return false; | 376 | return false; |
| 377 | } | 377 | } |
| 378 | 378 | ||