aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2009-11-25 15:28:43 +0000
committerJustin Clark-Casey (justincc)2009-11-25 15:28:43 +0000
commitf9807884a425c2d91e8f2035993a0ca5e210eb43 (patch)
tree36d4e7e70483afe86e4b88edcc4de987509dc25a
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-f9807884a425c2d91e8f2035993a0ca5e210eb43.zip
opensim-SC_OLD-f9807884a425c2d91e8f2035993a0ca5e210eb43.tar.gz
opensim-SC_OLD-f9807884a425c2d91e8f2035993a0ca5e210eb43.tar.bz2
opensim-SC_OLD-f9807884a425c2d91e8f2035993a0ca5e210eb43.tar.xz
Add MIT/X11 licensed NDesk.Options (http://www.ndesk.org/Options) DLL to aid command line parsing
-rw-r--r--CONTRIBUTORS.txt1
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs10
-rw-r--r--bin/NDesk.Options.dllbin0 -> 22016 bytes
-rw-r--r--prebuild.xml1
4 files changed, 11 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index ee263a1..8744a08 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -158,6 +158,7 @@ This software uses components from the following developers:
158* Nini (http://nini.sourceforge.net/) 158* Nini (http://nini.sourceforge.net/)
159* log4net (http://logging.apache.org/log4net/) 159* log4net (http://logging.apache.org/log4net/)
160* GlynnTucker.Cache (http://gtcache.sourceforge.net/) 160* GlynnTucker.Cache (http://gtcache.sourceforge.net/)
161* NDesk.Options 0.2.1 (http://www.ndesk.org/Options)
161 162
162Some plugins are based on Cable Beach 163Some plugins are based on Cable Beach
163Cable Beach is Copyright (c) 2008 Intel Corporation 164Cable Beach is Copyright (c) 2008 Intel Corporation
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
index 181f4c6..98fdec3 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
28using System; 28using System;
29using System.Collections.Generic;
29using System.IO; 30using System.IO;
30using System.Reflection; 31using System.Reflection;
31using log4net; 32using log4net;
33using NDesk.Options;
32using Nini.Config; 34using Nini.Config;
33using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
@@ -91,7 +93,13 @@ 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 OptionSet options = new OptionSet() {};
97 List<string> mainParams = options.Parse(cmdparams);
98
99 foreach (string param in mainParams)
100 m_log.DebugFormat("Found param [{0}]", param);
101
102 if (mainParams.Count > 2)
95 { 103 {
96 DearchiveRegion(cmdparams[2]); 104 DearchiveRegion(cmdparams[2]);
97 } 105 }
diff --git a/bin/NDesk.Options.dll b/bin/NDesk.Options.dll
new file mode 100644
index 0000000..df45878
--- /dev/null
+++ b/bin/NDesk.Options.dll
Binary files differ
diff --git a/prebuild.xml b/prebuild.xml
index 26535fb..ad06938 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1596,6 +1596,7 @@
1596 <Reference name="System.Xml"/> 1596 <Reference name="System.Xml"/>
1597 <Reference name="System.Drawing"/> 1597 <Reference name="System.Drawing"/>
1598 <Reference name="System.Web"/> 1598 <Reference name="System.Web"/>
1599 <Reference name="NDesk.Options"/>
1599 <Reference name="OpenMetaverseTypes.dll"/> 1600 <Reference name="OpenMetaverseTypes.dll"/>
1600 <Reference name="OpenMetaverse.StructuredData.dll"/> 1601 <Reference name="OpenMetaverse.StructuredData.dll"/>
1601 <Reference name="OpenMetaverse.dll"/> 1602 <Reference name="OpenMetaverse.dll"/>