diff options
author | Melanie | 2013-02-22 01:28:54 +0000 |
---|---|---|
committer | Melanie | 2013-02-22 01:28:54 +0000 |
commit | 9534d5f9296979b68550177a5201c2bdba84f14e (patch) | |
tree | 1d39dee6d1eaed10b1146a9ee59a6deaa062bae2 /OpenSim/Region/CoreModules/World/Objects | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-9534d5f9296979b68550177a5201c2bdba84f14e.zip opensim-SC-9534d5f9296979b68550177a5201c2bdba84f14e.tar.gz opensim-SC-9534d5f9296979b68550177a5201c2bdba84f14e.tar.bz2 opensim-SC-9534d5f9296979b68550177a5201c2bdba84f14e.tar.xz |
Merge branch 'master' into careminster
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 | ||