From 8dfe59d7b88309fdc2436abe7dda9a2fc699a427 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 1 Nov 2012 03:42:15 +0000
Subject: Comment out checks not to overwrite existing IAR/OAR files for now on
"save iar/oar" since this causes problems for some backup systems.
Needs more thought, maybe an explicit --force/--overwrite switch
Comments on http://opensimulator.org/mantis/view.php?id=6389
---
.../Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 4 ++--
OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index afe1200..fdba682 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -210,8 +210,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
Guid id, string firstName, string lastName, string invPath, string pass, string savePath,
Dictionary<string, object> options)
{
- if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, savePath))
- return false;
+// if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, savePath))
+// return false;
if (m_scenes.Count > 0)
{
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
index 970487a..abf3713 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
@@ -158,8 +158,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
else
path = DEFAULT_OAR_BACKUP_FILENAME;
- if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, path))
- return;
+ // Not doing this right now as this causes some problems with auto-backup systems. Maybe a force flag is
+ // needed
+// if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, path))
+// return;
ArchiveRegion(path, options);
}
--
cgit v1.1