1 files changed, 282 insertions, 282 deletions

diff --git a/OpenSim/Framework/Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs
index f73e15e..1eb6ff0 100644
--- a/OpenSim/Framework/Console/LogBase.cs
+++ b/OpenSim/Framework/Console/LogBase.cs
@@ -1,282 +1,282 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-using System;

-using System.IO;

-using System.Net;

-

-namespace OpenSim.Framework.Console

-{

-    public enum LogPriority : int

-    {

-        CRITICAL,

-        HIGH,

-        MEDIUM,

-        NORMAL,

-        LOW,

-        VERBOSE,

-        EXTRAVERBOSE

-    }

-

-    public class LogBase

-    {

-        StreamWriter Log;

-        public conscmd_callback cmdparser;

-        public string componentname;

-        private bool m_silent;

-

-        public LogBase(string LogFile, string componentname, conscmd_callback cmdparser, bool silent)

-        {

-            this.componentname = componentname;

-            this.cmdparser = cmdparser;

-            this.m_silent = silent;

-            System.Console.WriteLine("ServerConsole.cs - creating new local console");

-

-            if (String.IsNullOrEmpty(LogFile))

-            {

-                LogFile = componentname + ".log";

-            }

-

-            System.Console.WriteLine("Logs will be saved to current directory in " + LogFile);

-            Log = File.AppendText(LogFile);

-            Log.WriteLine("========================================================================");

-            Log.WriteLine(componentname + " Started at " + DateTime.Now.ToString());

-        }

-

-        public void Close()

-        {

-            Log.WriteLine("Shutdown at " + DateTime.Now.ToString());

-            Log.Close();

-        }

-

-        public void Write(string format, params object[] args)

-        {

-            Notice(format, args);

-            return;

-        }

-

-        public void WriteLine(LogPriority importance, string format, params object[] args)

-        {

-            Log.WriteLine(format, args);

-            Log.Flush();

-            if (!m_silent)

-            {

-                System.Console.WriteLine(format, args);

-            }

-            return;

-        }

-

-        public void Warn(string format, params object[] args)

-        {

-            WriteNewLine(ConsoleColor.Yellow, format, args);

-            return;

-        }

-

-        public void Notice(string format, params object[] args)

-        {

-            WriteNewLine(ConsoleColor.White, format, args);

-            return;

-        }

-

-        public void Error(string format, params object[] args)

-        {

-            WriteNewLine(ConsoleColor.Red, format, args);

-            return;

-        }

-

-        public void Verbose(string format, params object[] args)

-        {

-            WriteNewLine(ConsoleColor.Gray, format, args);

-            return;

-        }

-

-        public void Status(string format, params object[] args)

-        {

-            WriteNewLine(ConsoleColor.Blue, format, args);

-            return;

-        }

-

-        private void WriteNewLine(ConsoleColor color, string format, params object[] args)

-        {

-            Log.WriteLine(format, args);

-            Log.Flush();

-            if (!m_silent)

-            {

-                try

-                {

-                    System.Console.ForegroundColor = color;

-                    System.Console.WriteLine(format, args);

-                    System.Console.ResetColor();

-                }

-                catch (ArgumentNullException)

-                {

-                    // Some older systems dont support coloured text.

-                    System.Console.WriteLine(format, args);

-                }

-            }

-            return;

-        }

-

-        public string ReadLine()

-        {

-            string TempStr = System.Console.ReadLine();

-            Log.WriteLine(TempStr);

-            return TempStr;

-        }

-

-        public int Read()

-        {

-            int TempInt = System.Console.Read();

-            Log.Write((char)TempInt);

-            return TempInt;

-        }

-

-        public IPAddress CmdPromptIPAddress(string prompt, string defaultvalue)

-        {

-            IPAddress address;

-            string addressStr;

-

-            while (true)

-            {

-                addressStr = MainLog.Instance.CmdPrompt(prompt, defaultvalue);

-                if (IPAddress.TryParse(addressStr, out address))

-                {

-                    break;

-                }

-                else

-                {

-                    MainLog.Instance.Error("Illegal address. Please re-enter.");

-                }

-            }

-

-            return address;

-        }

-

-        public int CmdPromptIPPort(string prompt, string defaultvalue)

-        {

-            int port;

-            string portStr;

-

-            while (true)

-            {

-                portStr = MainLog.Instance.CmdPrompt(prompt, defaultvalue);

-                if (int.TryParse(portStr, out port))

-                {

-                    if (port >= IPEndPoint.MinPort && port <= IPEndPoint.MaxPort)

-                    {

-                        break;

-                    }

-                }

-

-                MainLog.Instance.Error("Illegal address. Please re-enter.");

-            }

-

-            return port;

-        }

-

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

-        // Done with no echo and suitable for passwords

-        public string PasswdPrompt(string prompt)

-        {

-            // FIXME: Needs to be better abstracted

-            Log.WriteLine(prompt);

-            this.Write(prompt);

-            ConsoleColor oldfg = System.Console.ForegroundColor;

-            System.Console.ForegroundColor = System.Console.BackgroundColor;

-            string temp = System.Console.ReadLine();

-            System.Console.ForegroundColor = oldfg;

-            return temp;

-        }

-

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

-        public string CmdPrompt(string prompt)

-        {

-            this.Write(String.Format("{0}: ", prompt));

-            return this.ReadLine();

-        }

-

-        // Displays a command prompt and returns a default value if the user simply presses enter

-        public string CmdPrompt(string prompt, string defaultresponse)

-        {

-            string temp = CmdPrompt(String.Format("{0} [{1}]", prompt, defaultresponse));

-            if (temp == "")

-            {

-                return defaultresponse;

-            }

-            else

-            {

-                return temp;

-            }

-        }

-

-        // Displays a command prompt and returns a default value, user may only enter 1 of 2 options

-        public string CmdPrompt(string prompt, string defaultresponse, string OptionA, string OptionB)

-        {

-            bool itisdone = false;

-            string temp = CmdPrompt(prompt, defaultresponse);

-            while (itisdone == false)

-            {

-                if ((temp == OptionA) || (temp == OptionB))

-                {

-                    itisdone = true;

-                }

-                else

-                {

-                    Notice("Valid options are " + OptionA + " or " + OptionB);

-                    temp = CmdPrompt(prompt, defaultresponse);

-                }

-            }

-            return temp;

-        }

-

-        // Runs a command with a number of parameters

-        public Object RunCmd(string Cmd, string[] cmdparams)

-        {

-            cmdparser.RunCmd(Cmd, cmdparams);

-            return null;

-        }

-

-        // Shows data about something

-        public void ShowCommands(string ShowWhat)

-        {

-            cmdparser.Show(ShowWhat);

-        }

-

-        public void MainLogPrompt()

-        {

-            string[] tempstrarray;

-            string tempstr = this.CmdPrompt(this.componentname + "# ");

-            tempstrarray = tempstr.Split(' ');

-            string cmd = tempstrarray[0];

-            Array.Reverse(tempstrarray);

-            Array.Resize<string>(ref tempstrarray, tempstrarray.Length - 1);

-            Array.Reverse(tempstrarray);

-            string[] cmdparams = (string[])tempstrarray;

-            RunCmd(cmd, cmdparams);

-        }

-    }

-}

+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.IO;
+using System.Net;
+
+namespace OpenSim.Framework.Console
+{
+    public enum LogPriority : int
+    {
+        CRITICAL,
+        HIGH,
+        MEDIUM,
+        NORMAL,
+        LOW,
+        VERBOSE,
+        EXTRAVERBOSE
+    }
+
+    public class LogBase
+    {
+        StreamWriter Log;
+        public conscmd_callback cmdparser;
+        public string componentname;
+        private bool m_silent;
+
+        public LogBase(string LogFile, string componentname, conscmd_callback cmdparser, bool silent)
+        {
+            this.componentname = componentname;
+            this.cmdparser = cmdparser;
+            this.m_silent = silent;
+            System.Console.WriteLine("ServerConsole.cs - creating new local console");
+
+            if (String.IsNullOrEmpty(LogFile))
+            {
+                LogFile = componentname + ".log";
+            }
+
+            System.Console.WriteLine("Logs will be saved to current directory in " + LogFile);
+            Log = File.AppendText(LogFile);
+            Log.WriteLine("========================================================================");
+            Log.WriteLine(componentname + " Started at " + DateTime.Now.ToString());
+        }
+
+        public void Close()
+        {
+            Log.WriteLine("Shutdown at " + DateTime.Now.ToString());
+            Log.Close();
+        }
+
+        public void Write(string format, params object[] args)
+        {
+            Notice(format, args);
+            return;
+        }
+
+        public void WriteLine(LogPriority importance, string format, params object[] args)
+        {
+            Log.WriteLine(format, args);
+            Log.Flush();
+            if (!m_silent)
+            {
+                System.Console.WriteLine(format, args);
+            }
+            return;
+        }
+
+        public void Warn(string format, params object[] args)
+        {
+            WriteNewLine(ConsoleColor.Yellow, format, args);
+            return;
+        }
+
+        public void Notice(string format, params object[] args)
+        {
+            WriteNewLine(ConsoleColor.White, format, args);
+            return;
+        }
+
+        public void Error(string format, params object[] args)
+        {
+            WriteNewLine(ConsoleColor.Red, format, args);
+            return;
+        }
+
+        public void Verbose(string format, params object[] args)
+        {
+            WriteNewLine(ConsoleColor.Gray, format, args);
+            return;
+        }
+
+        public void Status(string format, params object[] args)
+        {
+            WriteNewLine(ConsoleColor.Blue, format, args);
+            return;
+        }
+
+        private void WriteNewLine(ConsoleColor color, string format, params object[] args)
+        {
+            Log.WriteLine(format, args);
+            Log.Flush();
+            if (!m_silent)
+            {
+                try
+                {
+                    System.Console.ForegroundColor = color;
+                    System.Console.WriteLine(format, args);
+                    System.Console.ResetColor();
+                }
+                catch (ArgumentNullException)
+                {
+                    // Some older systems dont support coloured text.
+                    System.Console.WriteLine(format, args);
+                }
+            }
+            return;
+        }
+
+        public string ReadLine()
+        {
+            string TempStr = System.Console.ReadLine();
+            Log.WriteLine(TempStr);
+            return TempStr;
+        }
+
+        public int Read()
+        {
+            int TempInt = System.Console.Read();
+            Log.Write((char)TempInt);
+            return TempInt;
+        }
+
+        public IPAddress CmdPromptIPAddress(string prompt, string defaultvalue)
+        {
+            IPAddress address;
+            string addressStr;
+
+            while (true)
+            {
+                addressStr = MainLog.Instance.CmdPrompt(prompt, defaultvalue);
+                if (IPAddress.TryParse(addressStr, out address))
+                {
+                    break;
+                }
+                else
+                {
+                    MainLog.Instance.Error("Illegal address. Please re-enter.");
+                }
+            }
+
+            return address;
+        }
+
+        public int CmdPromptIPPort(string prompt, string defaultvalue)
+        {
+            int port;
+            string portStr;
+
+            while (true)
+            {
+                portStr = MainLog.Instance.CmdPrompt(prompt, defaultvalue);
+                if (int.TryParse(portStr, out port))
+                {
+                    if (port >= IPEndPoint.MinPort && port <= IPEndPoint.MaxPort)
+                    {
+                        break;
+                    }
+                }
+
+                MainLog.Instance.Error("Illegal address. Please re-enter.");
+            }
+
+            return port;
+        }
+
+        // Displays a prompt and waits for the user to enter a string, then returns that string
+        // Done with no echo and suitable for passwords
+        public string PasswdPrompt(string prompt)
+        {
+            // FIXME: Needs to be better abstracted
+            Log.WriteLine(prompt);
+            this.Write(prompt);
+            ConsoleColor oldfg = System.Console.ForegroundColor;
+            System.Console.ForegroundColor = System.Console.BackgroundColor;
+            string temp = System.Console.ReadLine();
+            System.Console.ForegroundColor = oldfg;
+            return temp;
+        }
+
+        // Displays a command prompt and waits for the user to enter a string, then returns that string
+        public string CmdPrompt(string prompt)
+        {
+            this.Write(String.Format("{0}: ", prompt));
+            return this.ReadLine();
+        }
+
+        // Displays a command prompt and returns a default value if the user simply presses enter
+        public string CmdPrompt(string prompt, string defaultresponse)
+        {
+            string temp = CmdPrompt(String.Format("{0} [{1}]", prompt, defaultresponse));
+            if (temp == "")
+            {
+                return defaultresponse;
+            }
+            else
+            {
+                return temp;
+            }
+        }
+
+        // Displays a command prompt and returns a default value, user may only enter 1 of 2 options
+        public string CmdPrompt(string prompt, string defaultresponse, string OptionA, string OptionB)
+        {
+            bool itisdone = false;
+            string temp = CmdPrompt(prompt, defaultresponse);
+            while (itisdone == false)
+            {
+                if ((temp == OptionA) || (temp == OptionB))
+                {
+                    itisdone = true;
+                }
+                else
+                {
+                    Notice("Valid options are " + OptionA + " or " + OptionB);
+                    temp = CmdPrompt(prompt, defaultresponse);
+                }
+            }
+            return temp;
+        }
+
+        // Runs a command with a number of parameters
+        public Object RunCmd(string Cmd, string[] cmdparams)
+        {
+            cmdparser.RunCmd(Cmd, cmdparams);
+            return null;
+        }
+
+        // Shows data about something
+        public void ShowCommands(string ShowWhat)
+        {
+            cmdparser.Show(ShowWhat);
+        }
+
+        public void MainLogPrompt()
+        {
+            string[] tempstrarray;
+            string tempstr = this.CmdPrompt(this.componentname + "# ");
+            tempstrarray = tempstr.Split(' ');
+            string cmd = tempstrarray[0];
+            Array.Reverse(tempstrarray);
+            Array.Resize<string>(ref tempstrarray, tempstrarray.Length - 1);
+            Array.Reverse(tempstrarray);
+            string[] cmdparams = (string[])tempstrarray;
+            RunCmd(cmd, cmdparams);
+        }
+    }
+}