added movement etc from r191

2 files changed, 10 insertions, 14 deletions

diff --git a/src/ServerConsole/ServerConsole/AssemblyInfo.cs b/src/ServerConsole/ServerConsole/AssemblyInfo.cs
index 88b4019..57481fc 100644
--- a/src/ServerConsole/ServerConsole/AssemblyInfo.cs
+++ b/src/ServerConsole/ServerConsole/AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 
 [assembly: ComVisibleAttribute(false)]
 [assembly: CLSCompliantAttribute(false)]
-[assembly: AssemblyVersionAttribute("0.1.*.191")]
+[assembly: AssemblyVersionAttribute("0.1.*.192")]
 [assembly: AssemblyTitleAttribute("opensim-serverconsole")]
 [assembly: AssemblyDescriptionAttribute("The default server console")]
 [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
diff --git a/src/ServerConsole/ServerConsole/ServerConsole.cs b/src/ServerConsole/ServerConsole/ServerConsole.cs
index 93c8114..27d97e5 100644
--- a/src/ServerConsole/ServerConsole/ServerConsole.cs
+++ b/src/ServerConsole/ServerConsole/ServerConsole.cs
@@ -43,12 +43,7 @@ namespace ServerConsole
                                 instance = value;

                         }

                 }

-                

-                public MainConsole()

-                {

-                        

-                }

-        }

+    }

         

         public abstract class ConsoleBase

         {

@@ -60,16 +55,15 @@ namespace ServerConsole
                 }

 

                 public abstract void Close();

-        

-                // You know what ReadLine() and WriteLine() do, right? And Read() and Write()? Right, you do actually know C#, right? Are you actually a programmer? Do you know english? Do you find my sense of humour in comments irritating? Good, glad you're still here

-                public abstract void WriteLine(string Line) ;

-                

+

+        public abstract void Write(string format, params object[] args);

+

+        public abstract void WriteLine(string format, params object[] args);    

+            

                 public abstract string ReadLine();

 

                 public abstract int Read() ;

 

-                public abstract void Write(string Line) ;

-

                 // Displays a command prompt and waits for the user to enter a string, then returns that string

                 public abstract string CmdPrompt(string prompt) ;

                 

@@ -87,5 +81,7 @@ namespace ServerConsole
         

                 // Displays a prompt to the user and then runs the command they entered

                 public abstract void MainConsolePrompt() ;

-        }

+

+        public abstract void SetStatus( string status );

+    }

 }