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

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

@ -154,8 +154,20 @@ namespace OpenSim.Region.OptionalModules.Materials
m_changed.Remove(fm); m_changed.Remove(fm);
} }
} }
}
if(toStore.Count > 0) if(toStore.Count > 0)
{
if (forcedBackup)
{
foreach (FaceMaterial fm in toStore)
{
AssetBase a = MakeAsset(fm, false);
m_scene.AssetService.Store(a);
}
}
else
{
Util.FireAndForget(delegate Util.FireAndForget(delegate
{ {
foreach (FaceMaterial fm in toStore) foreach (FaceMaterial fm in toStore)
@ -166,6 +178,7 @@ namespace OpenSim.Region.OptionalModules.Materials
}); });
} }
} }
}
private void EventManager_OnObjectAddedToScene(SceneObjectGroup obj) private void EventManager_OnObjectAddedToScene(SceneObjectGroup obj)
{ {