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

Make console backup command do a forced backup rather than non-forced 

Remove no-arg backup method for simplicity as it only make sense to call non-forced backup internally
viewer-2-initial-appearance
Justin Clark-Casey (justincc) 2010-09-06 23:12:03 +01:00
parent 537fefa3f2
commit ab875b32c1
4 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -1527,11 +1527,6 @@ namespace OpenSim.Region.Framework.Scenes
/// Wrapper for Backup() that can be called with Util.FireAndForget() /// Wrapper for Backup() that can be called with Util.FireAndForget()
/// </summary> /// </summary>
private void BackupWaitCallback(object o) private void BackupWaitCallback(object o)
{
Backup();
}
public void Backup()
{ {
Backup(false); Backup(false);
} }

2
OpenSim/Region/Framework/Scenes/SceneManager.cs
View File

@ -300,7 +300,7 @@ namespace OpenSim.Region.Framework.Scenes
public void BackupCurrentScene() public void BackupCurrentScene()
{ {
ForEachCurrentScene(delegate(Scene scene) { scene.Backup(); }); ForEachCurrentScene(delegate(Scene scene) { scene.Backup(true); });
} }
public bool TrySetCurrentScene(string regionName) public bool TrySetCurrentScene(string regionName)

2
OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
View File

@ -300,7 +300,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
} }
} }
m_log.Info("[CMMODEL]: Scheduling a backup of new scene object groups to backup."); m_log.Info("[CMMODEL]: Scheduling a backup of new scene object groups to backup.");
scene.Backup(); scene.Backup(true);
} }
/// <summary> /// <summary>

2
OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
View File

@ -133,7 +133,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
m_firstEmptyCompileQueue = false; m_firstEmptyCompileQueue = false;
m_oarFileLoading = false; m_oarFileLoading = false;
m_scene.Backup(); m_scene.Backup(false);
c.From = "RegionReady"; c.From = "RegionReady";
if (m_lastOarLoadedOk) if (m_lastOarLoadedOk)