aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorMelanie2012-11-01 15:52:32 +0000
committerMelanie2012-11-01 15:52:32 +0000
commite7a6328ea40bbbc5dba50ca21ec4e9e2c7283081 (patch)
tree105184438f58ba43388aa285e456dfd5ff87fdcd /OpenSim/Region/CoreModules
parentMerge branch 'master' into careminster (diff)
parentComment out checks not to overwrite existing IAR/OAR files for now on "save i... (diff)
downloadopensim-SC_OLD-e7a6328ea40bbbc5dba50ca21ec4e9e2c7283081.zip
opensim-SC_OLD-e7a6328ea40bbbc5dba50ca21ec4e9e2c7283081.tar.gz
opensim-SC_OLD-e7a6328ea40bbbc5dba50ca21ec4e9e2c7283081.tar.bz2
opensim-SC_OLD-e7a6328ea40bbbc5dba50ca21ec4e9e2c7283081.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs6
2 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index a32afd5..765b960 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
210 Guid id, string firstName, string lastName, string invPath, string pass, string savePath, 210 Guid id, string firstName, string lastName, string invPath, string pass, string savePath,
211 Dictionary<string, object> options) 211 Dictionary<string, object> options)
212 { 212 {
213 if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, savePath)) 213// if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, savePath))
214 return false; 214// return false;
215 215
216 if (m_scenes.Count > 0) 216 if (m_scenes.Count > 0)
217 { 217 {
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 }