OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lock collision mesh cache when accessing

inv-download
dahlia 2015-05-03 19:54:03 -07:00
parent 60e719286b
commit 73efb1633f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
View File

@ -928,8 +928,11 @@ namespace OpenSim.Region.Physics.Meshing
if (shouldCache) if (shouldCache)
{ {
key = primShape.GetMeshKey(size, lod); key = primShape.GetMeshKey(size, lod);
if (m_uniqueMeshes.TryGetValue(key, out mesh)) lock (m_uniqueMeshes)
return mesh; {
if (m_uniqueMeshes.TryGetValue(key, out mesh))
return mesh;
}
} }
if (size.X < 0.01f) size.X = 0.01f; if (size.X < 0.01f) size.X = 0.01f;
@ -955,7 +958,10 @@ namespace OpenSim.Region.Physics.Meshing
if (shouldCache) if (shouldCache)
{ {
m_uniqueMeshes.Add(key, mesh); lock (m_uniqueMeshes)
{
m_uniqueMeshes.Add(key, mesh);
}
} }
} }