diff options
author | Dan Lake | 2011-07-20 15:01:32 -0700 |
---|---|---|
committer | Dan Lake | 2011-07-20 15:01:32 -0700 |
commit | 2c11f7fc38ba14e041ed0e648088d574dadaaffe (patch) | |
tree | d593e3d1130e78ec74a11650d413f451a9a844da /OpenSim/Region/Physics/Meshing | |
parent | Merge branch 'master' into bulletsim (diff) | |
parent | Removed unused AddPrimShape methods in PhysicsScene caused by merge conflicts (diff) | |
download | opensim-SC_OLD-2c11f7fc38ba14e041ed0e648088d574dadaaffe.zip opensim-SC_OLD-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.gz opensim-SC_OLD-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.bz2 opensim-SC_OLD-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.xz |
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Region/Physics/Meshing')
-rw-r--r-- | OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index 5ca5f20..5413aa8 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |||
@@ -303,6 +303,10 @@ namespace OpenSim.Region.Physics.Meshing | |||
303 | 303 | ||
304 | private Mesh CreateMeshFromPrimMesher(string primName, PrimitiveBaseShape primShape, Vector3 size, float lod) | 304 | private Mesh CreateMeshFromPrimMesher(string primName, PrimitiveBaseShape primShape, Vector3 size, float lod) |
305 | { | 305 | { |
306 | // m_log.DebugFormat( | ||
307 | // "[MESH]: Creating physics proxy for {0}, shape {1}", | ||
308 | // primName, (OpenMetaverse.SculptType)primShape.SculptType); | ||
309 | |||
306 | PrimMesh primMesh; | 310 | PrimMesh primMesh; |
307 | PrimMesher.SculptMesh sculptMesh; | 311 | PrimMesher.SculptMesh sculptMesh; |
308 | 312 | ||
@@ -668,7 +672,6 @@ namespace OpenSim.Region.Physics.Meshing | |||
668 | 672 | ||
669 | // If this mesh has been created already, return it instead of creating another copy | 673 | // If this mesh has been created already, return it instead of creating another copy |
670 | // For large regions with 100k+ prims and hundreds of copies of each, this can save a GB or more of memory | 674 | // For large regions with 100k+ prims and hundreds of copies of each, this can save a GB or more of memory |
671 | |||
672 | key = GetMeshKey(primShape, size, lod); | 675 | key = GetMeshKey(primShape, size, lod); |
673 | if (m_uniqueMeshes.TryGetValue(key, out mesh)) | 676 | if (m_uniqueMeshes.TryGetValue(key, out mesh)) |
674 | return mesh; | 677 | return mesh; |