diff options
author | Teravus Ovares (Dan Olivares) | 2009-11-25 14:13:51 -0500 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-11-25 14:13:51 -0500 |
commit | dac9c6fb2360fd46603e08877d57a704eb02e183 (patch) | |
tree | 614ef8a4851d69a3fb3a76c7839ef576c234b6e7 /OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | |
parent | Patch: Fix a bug in LAND animation when the TickCount wraps into negative num... (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-dac9c6fb2360fd46603e08877d57a704eb02e183.zip opensim-SC_OLD-dac9c6fb2360fd46603e08877d57a704eb02e183.tar.gz opensim-SC_OLD-dac9c6fb2360fd46603e08877d57a704eb02e183.tar.bz2 opensim-SC_OLD-dac9c6fb2360fd46603e08877d57a704eb02e183.tar.xz |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs index 181f4c6..27763bb 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | |||
@@ -26,9 +26,11 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | ||
29 | using System.IO; | 30 | using System.IO; |
30 | using System.Reflection; | 31 | using System.Reflection; |
31 | using log4net; | 32 | using log4net; |
33 | using NDesk.Options; | ||
32 | using Nini.Config; | 34 | using Nini.Config; |
33 | using OpenSim.Region.Framework.Interfaces; | 35 | using OpenSim.Region.Framework.Interfaces; |
34 | using OpenSim.Region.Framework.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
@@ -91,13 +93,23 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
91 | /// <param name="cmdparams"></param> | 93 | /// <param name="cmdparams"></param> |
92 | public void HandleLoadOarConsoleCommand(string module, string[] cmdparams) | 94 | public void HandleLoadOarConsoleCommand(string module, string[] cmdparams) |
93 | { | 95 | { |
94 | if (cmdparams.Length > 2) | 96 | bool mergeOar = false; |
97 | |||
98 | OptionSet options = new OptionSet().Add("m|merge", delegate (string v) { mergeOar = v != null; }); | ||
99 | List<string> mainParams = options.Parse(cmdparams); | ||
100 | |||
101 | // m_log.DebugFormat("MERGE OAR IS [{0}]", mergeOar); | ||
102 | // | ||
103 | // foreach (string param in mainParams) | ||
104 | // m_log.DebugFormat("GOT PARAM [{0}]", param); | ||
105 | |||
106 | if (mainParams.Count > 2) | ||
95 | { | 107 | { |
96 | DearchiveRegion(cmdparams[2]); | 108 | DearchiveRegion(mainParams[2], mergeOar, Guid.Empty); |
97 | } | 109 | } |
98 | else | 110 | else |
99 | { | 111 | { |
100 | DearchiveRegion(DEFAULT_OAR_BACKUP_FILENAME); | 112 | DearchiveRegion(DEFAULT_OAR_BACKUP_FILENAME, mergeOar, Guid.Empty); |
101 | } | 113 | } |
102 | } | 114 | } |
103 | 115 | ||