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

Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

prebuild-update
Melanie 2010-07-24 23:15:38 +01:00
parent 4dbff62ef5 1a03a0b281
commit a9b7774fe0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.nant/local.include
View File

@ -20,6 +20,7 @@
<delete dir="${distbindir}/.nant"/> <delete dir="${distbindir}/.nant"/>
<delete> <delete>
<fileset basedir="${distbindir}"> <fileset basedir="${distbindir}">
<include name="compile.bat"/>
<include name="BUILDING.txt"/> <include name="BUILDING.txt"/>
<include name="Makefile"/> <include name="Makefile"/>
<include name="nant-color"/> <include name="nant-color"/>
@ -29,7 +30,7 @@
<include name="TESTING.txt"/> <include name="TESTING.txt"/>
<include name="TestResult.xml"/> <include name="TestResult.xml"/>
<include name="bin/OpenSim.Server.ini"/> <include name="bin/OpenSim.Server.ini"/>
<include name="bin/Regions/*"/> <include name="bin/Regions/Regions.ini"/>
<include name="bin/*.db"/> <include name="bin/*.db"/>
<include name="**/.git/**"/> <include name="**/.git/**"/>
<include name=".gitignore"/> <include name=".gitignore"/>

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

@ -118,7 +118,7 @@ namespace OpenSim.Framework.Console
// (Done with no echo and suitable for passwords) // (Done with no echo and suitable for passwords)
public string PasswdPrompt(string p) public string PasswdPrompt(string p)
{ {
return ReadLine(p, false, false); return ReadLine(String.Format("{0}: ", p), false, false);
} }
public virtual string ReadLine(string p, bool isCommand, bool e) public virtual string ReadLine(string p, bool isCommand, bool e)