Merge branch 'master' of /var/git/opensim/
commit
a1bc7f4ba1
|
@ -473,9 +473,11 @@ namespace OpenSim.Framework.Console
|
||||||
y = -1;
|
y = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
string commandLine = cmdline.ToString();
|
||||||
|
|
||||||
if (isCommand)
|
if (isCommand)
|
||||||
{
|
{
|
||||||
string[] cmd = Commands.Resolve(Parser.Parse(cmdline.ToString()));
|
string[] cmd = Commands.Resolve(Parser.Parse(commandLine));
|
||||||
|
|
||||||
if (cmd.Length != 0)
|
if (cmd.Length != 0)
|
||||||
{
|
{
|
||||||
|
@ -491,7 +493,10 @@ namespace OpenSim.Framework.Console
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//AddToHistory(cmdline.ToString());
|
// If we're not echoing to screen (e.g. a password) then we probably don't want it in history
|
||||||
|
if (echo && commandLine != "")
|
||||||
|
AddToHistory(commandLine);
|
||||||
|
|
||||||
return cmdline.ToString();
|
return cmdline.ToString();
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue