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

make materials save to grid less async on manual backup or shutdown

0.9.1.0-post-fixes
UbitUmarov 2019-06-14 20:12:33 +01:00
parent 79442c8c56
commit 05f508229c
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,7 +133,7 @@ namespace OpenSim.Region.OptionalModules.Materials
if(m_changed.Count == 0) if(m_changed.Count == 0)
return; return;
if(forcedBackup) if (forcedBackup)
{ {
toStore = new List<FaceMaterial>(m_changed.Keys); toStore = new List<FaceMaterial>(m_changed.Keys);
m_changed.Clear(); m_changed.Clear();
@ -154,16 +154,29 @@ namespace OpenSim.Region.OptionalModules.Materials
m_changed.Remove(fm); m_changed.Remove(fm);
} }
} }
}
if(toStore.Count > 0) if(toStore.Count > 0)
Util.FireAndForget(delegate {
if (forcedBackup)
{ {
foreach(FaceMaterial fm in toStore) foreach (FaceMaterial fm in toStore)
{ {
AssetBase a = MakeAsset(fm, false); AssetBase a = MakeAsset(fm, false);
m_scene.AssetService.Store(a); m_scene.AssetService.Store(a);
} }
}); }
else
{
Util.FireAndForget(delegate
{
foreach (FaceMaterial fm in toStore)
{
AssetBase a = MakeAsset(fm, false);
m_scene.AssetService.Store(a);
}
});
}
} }
} }