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

Allow entry of '?' in http URIs. If the field being typed begins with 

"http", the ? is just an ordinary character in that field.
GenericGridServerConcept
Melanie Thielker 2009-02-21 11:48:50 +00:00
parent 1cadad9ec6
commit aaf8b07ecf
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Framework/Console/ConsoleBase.cs
View File

@ -799,16 +799,25 @@ namespace OpenSim.Framework.Console
} }
} }
private void ContextHelp() private bool ContextHelp()
{ {
string[] words = Parser.Parse(cmdline.ToString()); string[] words = Parser.Parse(cmdline.ToString());
string[] opts = Commands.FindNextOption(words, cmdline.ToString().EndsWith(" ")); bool trailingSpace = cmdline.ToString().EndsWith(" ");
// Allow ? through while typing a URI
//
if (words.Length > 0 && words[words.Length-1].StartsWith("http") && !trailingSpace)
return false;
string[] opts = Commands.FindNextOption(words, trailingSpace);
if (opts[0].StartsWith("Command help:")) if (opts[0].StartsWith("Command help:"))
Output(opts[0]); Output(opts[0]);
else else
Output(String.Format("Options: {0}", String.Join(" ", opts))); Output(String.Format("Options: {0}", String.Join(" ", opts)));
return true;
} }
public void Prompt() public void Prompt()
@ -923,8 +932,8 @@ namespace OpenSim.Framework.Console
if (c == '?' && isCommand) if (c == '?' && isCommand)
{ {
ContextHelp(); if (ContextHelp())
continue; continue;
} }
cmdline.Insert(cp, c); cmdline.Insert(cp, c);