aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-07-16 01:36:27 +0100
committerJustin Clark-Casey (justincc)2011-07-16 01:36:27 +0100
commit18652eb87ef0613b66664059581f991448d76af4 (patch)
treed0ca27e3ccaed6d82d56e8431136ebf4ccb6df63 /OpenSim/Region/Physics/Meshing/Meshmerizer.cs
parentuse constants in llGetObjectDetails() rather than magic numbers (diff)
downloadopensim-SC_OLD-18652eb87ef0613b66664059581f991448d76af4.zip
opensim-SC_OLD-18652eb87ef0613b66664059581f991448d76af4.tar.gz
opensim-SC_OLD-18652eb87ef0613b66664059581f991448d76af4.tar.bz2
opensim-SC_OLD-18652eb87ef0613b66664059581f991448d76af4.tar.xz
Fix physics proxy regeneration when a mesh with more than one submesh is resized
Addresses http://opensimulator.org/mantis/view.php?id=5584
Diffstat (limited to 'OpenSim/Region/Physics/Meshing/Meshmerizer.cs')
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs5
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;