diff options
author | Justin Clark-Casey (justincc) | 2012-11-01 03:42:15 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-11-01 03:42:15 +0000 |
commit | 8dfe59d7b88309fdc2436abe7dda9a2fc699a427 (patch) | |
tree | f39b7f06b38e0af1d01638ba9994f149706595eb /OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-8dfe59d7b88309fdc2436abe7dda9a2fc699a427.zip opensim-SC_OLD-8dfe59d7b88309fdc2436abe7dda9a2fc699a427.tar.gz opensim-SC_OLD-8dfe59d7b88309fdc2436abe7dda9a2fc699a427.tar.bz2 opensim-SC_OLD-8dfe59d7b88309fdc2436abe7dda9a2fc699a427.tar.xz |
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
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | 6 |
1 files changed, 4 insertions, 2 deletions
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 | |||
158 | else | 158 | else |
159 | path = DEFAULT_OAR_BACKUP_FILENAME; | 159 | path = DEFAULT_OAR_BACKUP_FILENAME; |
160 | 160 | ||
161 | if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, path)) | 161 | // Not doing this right now as this causes some problems with auto-backup systems. Maybe a force flag is |
162 | return; | 162 | // needed |
163 | // if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, path)) | ||
164 | // return; | ||
163 | 165 | ||
164 | ArchiveRegion(path, options); | 166 | ArchiveRegion(path, options); |
165 | } | 167 | } |