diff options
author | Justin Clark-Casey (justincc) | 2010-09-06 23:12:03 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-09-06 23:12:03 +0100 |
commit | ab875b32c1cbfe2871a33b7757ffea5466692263 (patch) | |
tree | d708bfe885e6ee56e4178077052ae339e3662ae6 /OpenSim/Region/Framework/Scenes | |
parent | extend TestNewSceneObjectLinkPersistence() to check for presence of non-root ... (diff) | |
download | opensim-SC_OLD-ab875b32c1cbfe2871a33b7757ffea5466692263.zip opensim-SC_OLD-ab875b32c1cbfe2871a33b7757ffea5466692263.tar.gz opensim-SC_OLD-ab875b32c1cbfe2871a33b7757ffea5466692263.tar.bz2 opensim-SC_OLD-ab875b32c1cbfe2871a33b7757ffea5466692263.tar.xz |
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
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneManager.cs | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 93882ba..183310d 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1528,11 +1528,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1528 | /// </summary> | 1528 | /// </summary> |
1529 | private void BackupWaitCallback(object o) | 1529 | private void BackupWaitCallback(object o) |
1530 | { | 1530 | { |
1531 | Backup(); | ||
1532 | } | ||
1533 | |||
1534 | public void Backup() | ||
1535 | { | ||
1536 | Backup(false); | 1531 | Backup(false); |
1537 | } | 1532 | } |
1538 | 1533 | ||
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs index 3b84734..86ba2aa 100644 --- a/OpenSim/Region/Framework/Scenes/SceneManager.cs +++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs | |||
@@ -300,7 +300,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
300 | 300 | ||
301 | public void BackupCurrentScene() | 301 | public void BackupCurrentScene() |
302 | { | 302 | { |
303 | ForEachCurrentScene(delegate(Scene scene) { scene.Backup(); }); | 303 | ForEachCurrentScene(delegate(Scene scene) { scene.Backup(true); }); |
304 | } | 304 | } |
305 | 305 | ||
306 | public bool TrySetCurrentScene(string regionName) | 306 | public bool TrySetCurrentScene(string regionName) |