diff options
author | John Hurliman | 2009-09-30 15:28:23 -0700 |
---|---|---|
committer | John Hurliman | 2009-09-30 15:28:23 -0700 |
commit | acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009 (patch) | |
tree | 305349e1bd0a5849fd7f96483e24d5e07b24b8f4 /OpenSim/Framework/Console/CommandConsole.cs | |
parent | * Adding Scale to EntityBase * Fixing the incorrect initialization of EntityB... (diff) | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.zip opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.gz opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.bz2 opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Console/CommandConsole.cs')
-rw-r--r-- | OpenSim/Framework/Console/CommandConsole.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs index 06136ff..9671bc2 100644 --- a/OpenSim/Framework/Console/CommandConsole.cs +++ b/OpenSim/Framework/Console/CommandConsole.cs | |||
@@ -88,7 +88,7 @@ namespace OpenSim.Framework.Console | |||
88 | /// <param name="helpParts">Parsed parts of the help string. If empty then general help is returned.</param> | 88 | /// <param name="helpParts">Parsed parts of the help string. If empty then general help is returned.</param> |
89 | /// <returns></returns> | 89 | /// <returns></returns> |
90 | public List<string> GetHelp(string[] cmd) | 90 | public List<string> GetHelp(string[] cmd) |
91 | { | 91 | { |
92 | List<string> help = new List<string>(); | 92 | List<string> help = new List<string>(); |
93 | List<string> helpParts = new List<string>(cmd); | 93 | List<string> helpParts = new List<string>(cmd); |
94 | 94 | ||
@@ -115,7 +115,7 @@ namespace OpenSim.Framework.Console | |||
115 | /// <param name="helpParts"></param> | 115 | /// <param name="helpParts"></param> |
116 | /// <returns></returns> | 116 | /// <returns></returns> |
117 | private List<string> CollectHelp(List<string> helpParts) | 117 | private List<string> CollectHelp(List<string> helpParts) |
118 | { | 118 | { |
119 | string originalHelpRequest = string.Join(" ", helpParts.ToArray()); | 119 | string originalHelpRequest = string.Join(" ", helpParts.ToArray()); |
120 | List<string> help = new List<string>(); | 120 | List<string> help = new List<string>(); |
121 | 121 | ||
@@ -132,7 +132,7 @@ namespace OpenSim.Framework.Console | |||
132 | if (dict[helpPart] is Dictionary<string, Object>) | 132 | if (dict[helpPart] is Dictionary<string, Object>) |
133 | dict = (Dictionary<string, object>)dict[helpPart]; | 133 | dict = (Dictionary<string, object>)dict[helpPart]; |
134 | 134 | ||
135 | helpParts.RemoveAt(0); | 135 | helpParts.RemoveAt(0); |
136 | } | 136 | } |
137 | 137 | ||
138 | // There was a command for the given help string | 138 | // There was a command for the given help string |
@@ -149,7 +149,7 @@ namespace OpenSim.Framework.Console | |||
149 | } | 149 | } |
150 | 150 | ||
151 | return help; | 151 | return help; |
152 | } | 152 | } |
153 | 153 | ||
154 | private List<string> CollectHelp(Dictionary<string, object> dict) | 154 | private List<string> CollectHelp(Dictionary<string, object> dict) |
155 | { | 155 | { |
@@ -180,7 +180,7 @@ namespace OpenSim.Framework.Console | |||
180 | /// <param name="longhelp"></param> | 180 | /// <param name="longhelp"></param> |
181 | /// <param name="fn"></param> | 181 | /// <param name="fn"></param> |
182 | public void AddCommand(string module, bool shared, string command, | 182 | public void AddCommand(string module, bool shared, string command, |
183 | string help, string longhelp, CommandDelegate fn) | 183 | string help, string longhelp, CommandDelegate fn) |
184 | { | 184 | { |
185 | AddCommand(module, shared, command, help, longhelp, | 185 | AddCommand(module, shared, command, help, longhelp, |
186 | String.Empty, fn); | 186 | String.Empty, fn); |