From 0c0ac65d38c1c203ab318ace1a393baa625c48ba Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 22 Jul 2010 04:00:24 -0700
Subject: Added ': ' to password prompt. Mantis #4851

---
 OpenSim/Framework/Console/ConsoleBase.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
         // (Done with no echo and suitable for passwords)
         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)
-- 
cgit v1.1


From 2f6fa373eff4b2cb74788c78d10018af6e9f11aa Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 23 Jul 2010 22:36:03 +0100
Subject: in nant distbin, specifically only delete Regions.ini instead of the
 entire Regions directory

---
 .nant/local.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.nant/local.include b/.nant/local.include
index 0b6f9fe..8e4bc4d 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -29,7 +29,7 @@
       <include name="TESTING.txt"/>
       <include name="TestResult.xml"/>
       <include name="bin/OpenSim.Server.ini"/>
-      <include name="bin/Regions/*"/>
+      <include name="bin/Regions/Regions.ini"/>
       <include name="bin/*.db"/>
       <include name="**/.git/**"/>
       <include name=".gitignore"/>
-- 
cgit v1.1


From 1a03a0b281d343ce5b962c3a85b4b709b1277896 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 23 Jul 2010 23:12:30 +0100
Subject: remove compile.bat from a created binary distribution

---
 .nant/local.include | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.nant/local.include b/.nant/local.include
index 8e4bc4d..0279f25 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -20,6 +20,7 @@
   <delete dir="${distbindir}/.nant"/>
   <delete>
     <fileset basedir="${distbindir}">
+      <include name="compile.bat"/>
       <include name="BUILDING.txt"/>
       <include name="Makefile"/>
       <include name="nant-color"/>
-- 
cgit v1.1