diff options
author | Justin Clark-Casey (justincc) | 2013-02-20 22:09:33 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-02-20 22:09:33 +0000 |
commit | a671c06ee59e17a6ae7be9740e8e045ae9ac224c (patch) | |
tree | 9092bdca5fd4a8aac6123d2544fa388c0a6baff8 /OpenSim/Region/CoreModules/World/Objects | |
parent | Give the user some feedback about the success or failure of console login pro... (diff) | |
download | opensim-SC-a671c06ee59e17a6ae7be9740e8e045ae9ac224c.zip opensim-SC-a671c06ee59e17a6ae7be9740e8e045ae9ac224c.tar.gz opensim-SC-a671c06ee59e17a6ae7be9740e8e045ae9ac224c.tar.bz2 opensim-SC-a671c06ee59e17a6ae7be9740e8e045ae9ac224c.tar.xz |
Correct mistake in parsing 'show object pos' and similar pos commands where the 'to' text would be treat as the end vector rather than discarded.
Before this, the commands still work but the help text is wrong - one has to leave out the 'to' in stating the vectors
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Objects')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs index 9fc2daf..28db407 100644 --- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs +++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs | |||
@@ -416,7 +416,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
416 | 416 | ||
417 | if (!ConsoleUtil.TryParseConsoleMinVector(rawConsoleStartVector, out startVector)) | 417 | if (!ConsoleUtil.TryParseConsoleMinVector(rawConsoleStartVector, out startVector)) |
418 | { | 418 | { |
419 | m_console.OutputFormat("Error: Start vector {0} does not have a valid format", rawConsoleStartVector); | 419 | m_console.OutputFormat("Error: Start vector '{0}' does not have a valid format", rawConsoleStartVector); |
420 | return; | 420 | return; |
421 | } | 421 | } |
422 | 422 | ||
@@ -425,7 +425,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
425 | 425 | ||
426 | if (!ConsoleUtil.TryParseConsoleMaxVector(rawConsoleEndVector, out endVector)) | 426 | if (!ConsoleUtil.TryParseConsoleMaxVector(rawConsoleEndVector, out endVector)) |
427 | { | 427 | { |
428 | m_console.OutputFormat("Error: End vector {0} does not have a valid format", rawConsoleEndVector); | 428 | m_console.OutputFormat("Error: End vector '{0}' does not have a valid format", rawConsoleEndVector); |
429 | return; | 429 | return; |
430 | } | 430 | } |
431 | 431 | ||
@@ -896,17 +896,17 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
896 | 896 | ||
897 | if (!ConsoleUtil.TryParseConsoleMinVector(rawConsoleStartVector, out startVector)) | 897 | if (!ConsoleUtil.TryParseConsoleMinVector(rawConsoleStartVector, out startVector)) |
898 | { | 898 | { |
899 | m_console.OutputFormat("Error: Start vector {0} does not have a valid format", rawConsoleStartVector); | 899 | m_console.OutputFormat("Error: Start vector '{0}' does not have a valid format", rawConsoleStartVector); |
900 | endVector = Vector3.Zero; | 900 | endVector = Vector3.Zero; |
901 | 901 | ||
902 | return false; | 902 | return false; |
903 | } | 903 | } |
904 | 904 | ||
905 | string rawConsoleEndVector = rawComponents.Skip(1).Take(1).Single(); | 905 | string rawConsoleEndVector = rawComponents.Skip(2).Take(1).Single(); |
906 | 906 | ||
907 | if (!ConsoleUtil.TryParseConsoleMaxVector(rawConsoleEndVector, out endVector)) | 907 | if (!ConsoleUtil.TryParseConsoleMaxVector(rawConsoleEndVector, out endVector)) |
908 | { | 908 | { |
909 | m_console.OutputFormat("Error: End vector {0} does not have a valid format", rawConsoleEndVector); | 909 | m_console.OutputFormat("Error: End vector '{0}' does not have a valid format", rawConsoleEndVector); |
910 | return false; | 910 | return false; |
911 | } | 911 | } |
912 | 912 | ||