OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
user_profiles
Justin Clark-Casey (justincc) 2013-02-20 22:09:33 +00:00
parent 05a0998f57
commit a671c06ee5
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Framework/Console/ConsoleUtil.cs
View File

@ -49,14 +49,14 @@ namespace OpenSim.Framework.Console
= @"Each component of the coord is comma separated. There must be no spaces between the commas. = @"Each component of the coord is comma separated. There must be no spaces between the commas.
If you don't care about the z component you can simply omit it. If you don't care about the z component you can simply omit it.
If you don't care about the x or y components then you can leave them blank (though a comma is still required) If you don't care about the x or y components then you can leave them blank (though a comma is still required)
If you want to specify the maxmimum value of a component then you can use ~ instead of a number If you want to specify the maximum value of a component then you can use ~ instead of a number
If you want to specify the minimum value of a component then you can use -~ instead of a number If you want to specify the minimum value of a component then you can use -~ instead of a number
e.g. e.g.
delete object pos 20,20,20 to 40,40,40 show object pos 20,20,20 to 40,40,40
delete object pos 20,20 to 40,40 delete object pos 20,20 to 40,40
delete object pos ,20,20 to ,40,40 show object pos ,20,20 to ,40,40
delete object pos ,,30 to ,,~ delete object pos ,,30 to ,,~
delete object pos ,,-~ to ,,30"; show object pos ,,-~ to ,,30";
public const string MinRawConsoleVectorValue = "-~"; public const string MinRawConsoleVectorValue = "-~";
public const string MaxRawConsoleVectorValue = "~"; public const string MaxRawConsoleVectorValue = "~";

10
OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
View File

@ -416,7 +416,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
if (!ConsoleUtil.TryParseConsoleMinVector(rawConsoleStartVector, out startVector)) if (!ConsoleUtil.TryParseConsoleMinVector(rawConsoleStartVector, out startVector))
{ {
m_console.OutputFormat("Error: Start vector {0} does not have a valid format", rawConsoleStartVector); m_console.OutputFormat("Error: Start vector '{0}' does not have a valid format", rawConsoleStartVector);
return; return;
} }
@ -425,7 +425,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
if (!ConsoleUtil.TryParseConsoleMaxVector(rawConsoleEndVector, out endVector)) if (!ConsoleUtil.TryParseConsoleMaxVector(rawConsoleEndVector, out endVector))
{ {
m_console.OutputFormat("Error: End vector {0} does not have a valid format", rawConsoleEndVector); m_console.OutputFormat("Error: End vector '{0}' does not have a valid format", rawConsoleEndVector);
return; return;
} }
@ -896,17 +896,17 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
if (!ConsoleUtil.TryParseConsoleMinVector(rawConsoleStartVector, out startVector)) if (!ConsoleUtil.TryParseConsoleMinVector(rawConsoleStartVector, out startVector))
{ {
m_console.OutputFormat("Error: Start vector {0} does not have a valid format", rawConsoleStartVector); m_console.OutputFormat("Error: Start vector '{0}' does not have a valid format", rawConsoleStartVector);
endVector = Vector3.Zero; endVector = Vector3.Zero;
return false; return false;
} }
string rawConsoleEndVector = rawComponents.Skip(1).Take(1).Single(); string rawConsoleEndVector = rawComponents.Skip(2).Take(1).Single();
if (!ConsoleUtil.TryParseConsoleMaxVector(rawConsoleEndVector, out endVector)) if (!ConsoleUtil.TryParseConsoleMaxVector(rawConsoleEndVector, out endVector))
{ {
m_console.OutputFormat("Error: End vector {0} does not have a valid format", rawConsoleEndVector); m_console.OutputFormat("Error: End vector '{0}' does not have a valid format", rawConsoleEndVector);
return false; return false;
} }