Merge branch 'master' of /var/git/opensim/

viewer-2-initial-appearance
opensim mirror account 2010-11-17 15:40:03 -08:00
commit a1bc7f4ba1
1 changed files with 7 additions and 2 deletions

View File

@ -473,9 +473,11 @@ namespace OpenSim.Framework.Console
y = -1;
}
string commandLine = cmdline.ToString();
if (isCommand)
{
string[] cmd = Commands.Resolve(Parser.Parse(cmdline.ToString()));
string[] cmd = Commands.Resolve(Parser.Parse(commandLine));
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();
default:
break;