ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

mantis 8675: delay material delete (the reported log message may still happen, but less

Browse Source
This commit is contained in:
UbitUmarov
2020-03-20 10:50:56 +00:00
parent 9864d1abfc
commit 010f091dd4
2 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
View File

@@ -473,7 +473,7 @@ namespace OpenSim.Region.OptionalModules.Materials
if(m_Materials.ContainsKey(id))
{
m_MaterialsRefCount[id]--;
if (m_MaterialsRefCount[id] <= 0)
if (m_MaterialsRefCount[id] == 0)
delayedDelete.Enqueue(id);
}
}
@@ -866,13 +866,11 @@ namespace OpenSim.Region.OptionalModules.Materials
if(m_Materials.ContainsKey(id))
{
m_MaterialsRefCount[id]--;
if(m_MaterialsRefCount[id] <= 0)
if(m_MaterialsRefCount[id] == 0)
{
FaceMaterial fm = m_Materials[id];
m_changed.Remove(fm);
m_Materials.Remove(id);
m_MaterialsRefCount.Remove(id);
m_cache.Expire(id.ToString());
delayedDelete.Enqueue(id);
}
}
}