diff options
Diffstat (limited to 'OpenSim/Framework/Console/ConsoleUtil.cs')
-rw-r--r-- | OpenSim/Framework/Console/ConsoleUtil.cs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Framework/Console/ConsoleUtil.cs b/OpenSim/Framework/Console/ConsoleUtil.cs index 44f6dc1..bfa05a2 100644 --- a/OpenSim/Framework/Console/ConsoleUtil.cs +++ b/OpenSim/Framework/Console/ConsoleUtil.cs | |||
@@ -40,7 +40,7 @@ namespace OpenSim.Framework.Console | |||
40 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 40 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
41 | 41 | ||
42 | public const int LocalIdNotFound = 0; | 42 | public const int LocalIdNotFound = 0; |
43 | 43 | ||
44 | /// <summary> | 44 | /// <summary> |
45 | /// Used by modules to display stock co-ordinate help, though possibly this should be under some general section | 45 | /// Used by modules to display stock co-ordinate help, though possibly this should be under some general section |
46 | /// rather than in each help summary. | 46 | /// rather than in each help summary. |
@@ -57,10 +57,10 @@ namespace OpenSim.Framework.Console | |||
57 | show object pos ,20,20 to ,40,40 | 57 | show object pos ,20,20 to ,40,40 |
58 | delete object pos ,,30 to ,,~ | 58 | delete object pos ,,30 to ,,~ |
59 | show object pos ,,-~ to ,,30"; | 59 | show object pos ,,-~ to ,,30"; |
60 | 60 | ||
61 | public const string MinRawConsoleVectorValue = "-~"; | 61 | public const string MinRawConsoleVectorValue = "-~"; |
62 | public const string MaxRawConsoleVectorValue = "~"; | 62 | public const string MaxRawConsoleVectorValue = "~"; |
63 | 63 | ||
64 | public const string VectorSeparator = ","; | 64 | public const string VectorSeparator = ","; |
65 | public static char[] VectorSeparatorChars = VectorSeparator.ToCharArray(); | 65 | public static char[] VectorSeparatorChars = VectorSeparator.ToCharArray(); |
66 | 66 | ||
@@ -81,7 +81,7 @@ namespace OpenSim.Framework.Console | |||
81 | 81 | ||
82 | return true; | 82 | return true; |
83 | } | 83 | } |
84 | 84 | ||
85 | /// <summary> | 85 | /// <summary> |
86 | /// Try to parse a console UUID from the console. | 86 | /// Try to parse a console UUID from the console. |
87 | /// </summary> | 87 | /// </summary> |
@@ -101,7 +101,7 @@ namespace OpenSim.Framework.Console | |||
101 | 101 | ||
102 | return false; | 102 | return false; |
103 | } | 103 | } |
104 | 104 | ||
105 | return true; | 105 | return true; |
106 | } | 106 | } |
107 | 107 | ||
@@ -259,7 +259,7 @@ namespace OpenSim.Framework.Console | |||
259 | 259 | ||
260 | return false; | 260 | return false; |
261 | } | 261 | } |
262 | 262 | ||
263 | /// <summary> | 263 | /// <summary> |
264 | /// Convert a minimum vector input from the console to an OpenMetaverse.Vector3 | 264 | /// Convert a minimum vector input from the console to an OpenMetaverse.Vector3 |
265 | /// </summary> | 265 | /// </summary> |
@@ -270,7 +270,7 @@ namespace OpenSim.Framework.Console | |||
270 | { | 270 | { |
271 | return TryParseConsoleVector(rawConsoleVector, c => float.MinValue.ToString(), out vector); | 271 | return TryParseConsoleVector(rawConsoleVector, c => float.MinValue.ToString(), out vector); |
272 | } | 272 | } |
273 | 273 | ||
274 | /// <summary> | 274 | /// <summary> |
275 | /// Convert a maximum vector input from the console to an OpenMetaverse.Vector3 | 275 | /// Convert a maximum vector input from the console to an OpenMetaverse.Vector3 |
276 | /// </summary> | 276 | /// </summary> |
@@ -281,7 +281,7 @@ namespace OpenSim.Framework.Console | |||
281 | { | 281 | { |
282 | return TryParseConsoleVector(rawConsoleVector, c => float.MaxValue.ToString(), out vector); | 282 | return TryParseConsoleVector(rawConsoleVector, c => float.MaxValue.ToString(), out vector); |
283 | } | 283 | } |
284 | 284 | ||
285 | /// <summary> | 285 | /// <summary> |
286 | /// Convert a vector input from the console to an OpenMetaverse.Vector3 | 286 | /// Convert a vector input from the console to an OpenMetaverse.Vector3 |
287 | /// </summary> | 287 | /// </summary> |
@@ -354,10 +354,10 @@ namespace OpenSim.Framework.Console | |||
354 | string rawConsoleVector, int dimensions, Func<string, string> blankComponentFunc) | 354 | string rawConsoleVector, int dimensions, Func<string, string> blankComponentFunc) |
355 | { | 355 | { |
356 | List<string> components = rawConsoleVector.Split(VectorSeparatorChars).ToList(); | 356 | List<string> components = rawConsoleVector.Split(VectorSeparatorChars).ToList(); |
357 | 357 | ||
358 | if (components.Count < 1 || components.Count > dimensions) | 358 | if (components.Count < 1 || components.Count > dimensions) |
359 | return null; | 359 | return null; |
360 | 360 | ||
361 | if (components.Count < dimensions) | 361 | if (components.Count < dimensions) |
362 | { | 362 | { |
363 | if (blankComponentFunc == null) | 363 | if (blankComponentFunc == null) |
@@ -380,7 +380,7 @@ namespace OpenSim.Framework.Console | |||
380 | else | 380 | else |
381 | return c; | 381 | return c; |
382 | }); | 382 | }); |
383 | 383 | ||
384 | return string.Join(VectorSeparator, cookedComponents.ToArray()); | 384 | return string.Join(VectorSeparator, cookedComponents.ToArray()); |
385 | } | 385 | } |
386 | } | 386 | } |