diff options
| author | Melanie | 2012-11-01 15:52:32 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-01 15:52:32 +0000 |
| commit | e7a6328ea40bbbc5dba50ca21ec4e9e2c7283081 (patch) | |
| tree | 105184438f58ba43388aa285e456dfd5ff87fdcd /OpenSim/Region/CoreModules/Avatar | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Comment out checks not to overwrite existing IAR/OAR files for now on "save i... (diff) | |
| download | opensim-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/Avatar')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 4 |
1 files changed, 2 insertions, 2 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 | { |