ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-30 13:16:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

lock unique and uniqueReleased in same order when both locks are needed

Browse Source
This commit is contained in:
UbitUmarov
2012-11-02 10:14:08 +00:00
parent e6c8eca504
commit c2639bef8e
1 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs
View File

@@ -1057,25 +1057,22 @@ namespace OpenSim.Region.Physics.Meshing
mesh.RefCount++;
return mesh;
}
}
// try to find a identical mesh on meshs recently released
lock (m_uniqueReleasedMeshes)
{
m_uniqueReleasedMeshes.TryGetValue(key, out mesh);
if (mesh != null)
// try to find a identical mesh on meshs recently released
lock (m_uniqueReleasedMeshes)
{
m_uniqueReleasedMeshes.Remove(key);
lock (m_uniqueMeshes)
m_uniqueReleasedMeshes.TryGetValue(key, out mesh);
if (mesh != null)
{
m_uniqueReleasedMeshes.Remove(key);
try
{
m_uniqueMeshes.Add(key, mesh);
}
catch { }
mesh.RefCount = 1;
return mesh;
}
mesh.RefCount = 1;
return mesh;
}
}
return null;
@@ -1108,25 +1105,22 @@ namespace OpenSim.Region.Physics.Meshing
mesh.RefCount++;
return mesh;
}
}
// try to find a identical mesh on meshs recently released
lock (m_uniqueReleasedMeshes)
{
m_uniqueReleasedMeshes.TryGetValue(key, out mesh);
if (mesh != null)
// try to find a identical mesh on meshs recently released
lock (m_uniqueReleasedMeshes)
{
m_uniqueReleasedMeshes.Remove(key);
lock (m_uniqueMeshes)
m_uniqueReleasedMeshes.TryGetValue(key, out mesh);
if (mesh != null)
{
m_uniqueReleasedMeshes.Remove(key);
try
{
m_uniqueMeshes.Add(key, mesh);
}
catch { }
mesh.RefCount = 1;
return mesh;
}
mesh.RefCount = 1;
return mesh;
}
}