diff options
4 files changed, 3 insertions, 8 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) |
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs index e5fcb54..fd59138 100644 --- a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs | |||
@@ -300,7 +300,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement | |||
300 | } | 300 | } |
301 | } | 301 | } |
302 | m_log.Info("[CMMODEL]: Scheduling a backup of new scene object groups to backup."); | 302 | m_log.Info("[CMMODEL]: Scheduling a backup of new scene object groups to backup."); |
303 | scene.Backup(); | 303 | scene.Backup(true); |
304 | } | 304 | } |
305 | 305 | ||
306 | /// <summary> | 306 | /// <summary> |
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs index 672109b..122ad40 100644 --- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs | |||
@@ -133,7 +133,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady | |||
133 | m_firstEmptyCompileQueue = false; | 133 | m_firstEmptyCompileQueue = false; |
134 | m_oarFileLoading = false; | 134 | m_oarFileLoading = false; |
135 | 135 | ||
136 | m_scene.Backup(); | 136 | m_scene.Backup(false); |
137 | 137 | ||
138 | c.From = "RegionReady"; | 138 | c.From = "RegionReady"; |
139 | if (m_lastOarLoadedOk) | 139 | if (m_lastOarLoadedOk) |