diff options
author | Melanie | 2010-07-24 23:15:38 +0100 |
---|---|---|
committer | Melanie | 2010-07-24 23:15:38 +0100 |
commit | a9b7774fe0be37002edd738a224eed25548fde59 (patch) | |
tree | 9a50c9928d22477577b8f214e322012969de4887 | |
parent | Fix some inventory issues (diff) | |
parent | remove compile.bat from a created binary distribution (diff) | |
download | opensim-SC-a9b7774fe0be37002edd738a224eed25548fde59.zip opensim-SC-a9b7774fe0be37002edd738a224eed25548fde59.tar.gz opensim-SC-a9b7774fe0be37002edd738a224eed25548fde59.tar.bz2 opensim-SC-a9b7774fe0be37002edd738a224eed25548fde59.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | .nant/local.include | 3 | ||||
-rwxr-xr-x | OpenSim/Framework/Console/ConsoleBase.cs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.nant/local.include b/.nant/local.include index 0b6f9fe..0279f25 100644 --- a/.nant/local.include +++ b/.nant/local.include | |||
@@ -20,6 +20,7 @@ | |||
20 | <delete dir="${distbindir}/.nant"/> | 20 | <delete dir="${distbindir}/.nant"/> |
21 | <delete> | 21 | <delete> |
22 | <fileset basedir="${distbindir}"> | 22 | <fileset basedir="${distbindir}"> |
23 | <include name="compile.bat"/> | ||
23 | <include name="BUILDING.txt"/> | 24 | <include name="BUILDING.txt"/> |
24 | <include name="Makefile"/> | 25 | <include name="Makefile"/> |
25 | <include name="nant-color"/> | 26 | <include name="nant-color"/> |
@@ -29,7 +30,7 @@ | |||
29 | <include name="TESTING.txt"/> | 30 | <include name="TESTING.txt"/> |
30 | <include name="TestResult.xml"/> | 31 | <include name="TestResult.xml"/> |
31 | <include name="bin/OpenSim.Server.ini"/> | 32 | <include name="bin/OpenSim.Server.ini"/> |
32 | <include name="bin/Regions/*"/> | 33 | <include name="bin/Regions/Regions.ini"/> |
33 | <include name="bin/*.db"/> | 34 | <include name="bin/*.db"/> |
34 | <include name="**/.git/**"/> | 35 | <include name="**/.git/**"/> |
35 | <include name=".gitignore"/> | 36 | <include name=".gitignore"/> |
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs index b70d1db..aab920b 100755 --- a/OpenSim/Framework/Console/ConsoleBase.cs +++ b/OpenSim/Framework/Console/ConsoleBase.cs | |||
@@ -118,7 +118,7 @@ namespace OpenSim.Framework.Console | |||
118 | // (Done with no echo and suitable for passwords) | 118 | // (Done with no echo and suitable for passwords) |
119 | public string PasswdPrompt(string p) | 119 | public string PasswdPrompt(string p) |
120 | { | 120 | { |
121 | return ReadLine(p, false, false); | 121 | return ReadLine(String.Format("{0}: ", p), false, false); |
122 | } | 122 | } |
123 | 123 | ||
124 | public virtual string ReadLine(string p, bool isCommand, bool e) | 124 | public virtual string ReadLine(string p, bool isCommand, bool e) |