5 files changed, 52 insertions, 57 deletions

diff --git a/Common/OpenSim.Framework.Console/ConsoleBase.cs b/Common/OpenSim.Framework.Console/LogBase.cs
index 80a28e9..b625b75 100644
--- a/Common/OpenSim.Framework.Console/ConsoleBase.cs
+++ b/Common/OpenSim.Framework.Console/LogBase.cs
@@ -41,14 +41,14 @@ namespace OpenSim.Framework.Console
         EXTRAVERBOSE

     }

 

-    public class ConsoleBase

+    public class LogBase

     {

         StreamWriter Log;

         public conscmd_callback cmdparser;

         public string componentname;

         private bool m_silent;

 

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

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

         {

             this.componentname = componentname;

             this.cmdparser = cmdparser;

@@ -77,19 +77,7 @@ namespace OpenSim.Framework.Console
             Notice(format,args);

             return;

         }

-

-        [Obsolete("WriteLine(msg,args) has been depreciated, use WriteLine(priority,msg,args) instead.")]

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

-        {

-            Log.WriteLine(format, args);

-            Log.Flush();

-            if (!m_silent)

-            {

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

-            }

-            return;

-        }

-

+         

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

         {

             Log.WriteLine(format, args);

@@ -226,7 +214,7 @@ namespace OpenSim.Framework.Console
             cmdparser.Show(ShowWhat);

         }

 

-        public void MainConsolePrompt()

+        public void MainLogPrompt()

         {

             string[] tempstrarray;

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

diff --git a/Common/OpenSim.Framework.Console/MainConsole.cs b/Common/OpenSim.Framework.Console/MainLog.cs
index 01aa3d1..d7f945e 100644
--- a/Common/OpenSim.Framework.Console/MainConsole.cs
+++ b/Common/OpenSim.Framework.Console/MainLog.cs
@@ -29,11 +29,11 @@ using System;
 

 namespace OpenSim.Framework.Console

 {

-        public class MainConsole {

+        public class MainLog {

                 

-                private static ConsoleBase instance;

+                private static LogBase instance;

                 

-                public static ConsoleBase Instance 

+                public static LogBase Instance 

                 {

                         get 

                         {

diff --git a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj b/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
index 7af0eca..fef5108 100644
--- a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
+++ b/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,7 +6,8 @@
     <ProjectGuid>{A7CD0630-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon></ApplicationIcon>

+    <ApplicationIcon>

+    </ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenSim.Framework.Console</AssemblyName>

@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

     <RootNamespace>OpenSim.Framework.Console</RootNamespace>

-    <StartupObject></StartupObject>

+    <StartupObject>

+    </StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -55,10 +61,11 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System" >

+    <Reference Include="System">

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

@@ -69,13 +76,13 @@
     <Compile Include="AssemblyInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ConsoleBase.cs">

+    <Compile Include="LogBase.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="ConsoleCallbacksBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="MainConsole.cs">

+    <Compile Include="MainLog.cs">

       <SubType>Code</SubType>

     </Compile>

   </ItemGroup>

@@ -86,4 +93,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

+</Project>
\ No newline at end of file
diff --git a/Common/OpenSim.Framework/Types/NetworkServersInfo.cs b/Common/OpenSim.Framework/Types/NetworkServersInfo.cs
index 10df820..0cf0ea6 100644
--- a/Common/OpenSim.Framework/Types/NetworkServersInfo.cs
+++ b/Common/OpenSim.Framework/Types/NetworkServersInfo.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Framework.Types
                     attri = configData.GetAttribute("GridServerURL");

                     if (attri == "")

                     {

-                        this.GridURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:8001/");

+                        this.GridURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:8001/");

                         configData.SetAttribute("GridServerURL", this.GridURL);

                     }

                     else

@@ -72,7 +72,7 @@ namespace OpenSim.Framework.Types
                     attri = configData.GetAttribute("GridSendKey");

                     if (attri == "")

                     {

-                        this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to grid server", "null");

+                        this.GridSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to grid server", "null");

                         configData.SetAttribute("GridSendKey", this.GridSendKey);

                     }

                     else

@@ -85,7 +85,7 @@ namespace OpenSim.Framework.Types
                     attri = configData.GetAttribute("GridRecvKey");

                     if (attri == "")

                     {

-                        this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from grid server", "null");

+                        this.GridRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from grid server", "null");

                         configData.SetAttribute("GridRecvKey", this.GridRecvKey);

                     }

                     else

@@ -97,7 +97,7 @@ namespace OpenSim.Framework.Types
                     attri = configData.GetAttribute("AssetServerURL");

                     if (attri == "")

                     {

-                        this.AssetURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/");

+                        this.AssetURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/");

                         configData.SetAttribute("AssetServerURL", this.GridURL);

                     }

                     else

@@ -110,8 +110,8 @@ namespace OpenSim.Framework.Types
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "Config.cs:InitConfig() - Exception occured");

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, e.ToString());

+                OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");

+                OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());

             }

         }

     }

diff --git a/Common/OpenSim.Framework/Types/RegionInfo.cs b/Common/OpenSim.Framework/Types/RegionInfo.cs
index 2c24327..651cd5b 100644
--- a/Common/OpenSim.Framework/Types/RegionInfo.cs
+++ b/Common/OpenSim.Framework/Types/RegionInfo.cs
@@ -87,7 +87,7 @@ namespace OpenSim.Framework.Types
                 attri = configData.GetAttribute("SimName");

                 if (attri == "")

                 {

-                    this.RegionName = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Name", "OpenSim test");

+                    this.RegionName = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Name", "OpenSim test");

                     configData.SetAttribute("SimName", this.RegionName);

                 }

                 else

@@ -99,7 +99,7 @@ namespace OpenSim.Framework.Types
                 attri = configData.GetAttribute("SimLocationX");

                 if (attri == "")

                 {

-                    string location = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid Location X", "997");

+                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "997");

                     configData.SetAttribute("SimLocationX", location);

                     this.RegionLocX = (uint)Convert.ToUInt32(location);

                 }

@@ -112,7 +112,7 @@ namespace OpenSim.Framework.Types
                 attri = configData.GetAttribute("SimLocationY");

                 if (attri == "")

                 {

-                    string location = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid Location Y", "996");

+                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "996");

                     configData.SetAttribute("SimLocationY", location);

                     this.RegionLocY = (uint)Convert.ToUInt32(location);

                 }

@@ -126,7 +126,7 @@ namespace OpenSim.Framework.Types
                 attri = configData.GetAttribute("Datastore");

                 if (attri == "")

                 {

-                    string datastore = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Filename for local storage", "localworld.yap");

+                    string datastore = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Filename for local storage", "localworld.yap");

                     configData.SetAttribute("Datastore", datastore);

                     this.DataStore = datastore;

                 }

@@ -140,7 +140,7 @@ namespace OpenSim.Framework.Types
                 attri = configData.GetAttribute("SimListenPort");

                 if (attri == "")

                 {

-                    string port = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("UDP port for client connections", "9000");

+                    string port = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("UDP port for client connections", "9000");

                     configData.SetAttribute("SimListenPort", port);

                     this.IPListenPort = Convert.ToInt32(port);

                 }

@@ -154,7 +154,7 @@ namespace OpenSim.Framework.Types
                 attri = configData.GetAttribute("SimListenAddress");

                 if (attri == "")

                 {

-                    this.IPListenAddr = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("IP Address to listen on for client connections", "127.0.0.1");

+                    this.IPListenAddr = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("IP Address to listen on for client connections", "127.0.0.1");

                     configData.SetAttribute("SimListenAddress", this.IPListenAddr);

                 }

                 else

@@ -184,7 +184,7 @@ namespace OpenSim.Framework.Types
                 attri = configData.GetAttribute("TerrainFile");

                 if (attri == "")

                 {

-                    this.estateSettings.terrainFile = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Default Terrain File", "default.r32");

+                    this.estateSettings.terrainFile = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("GENERAL SETTING: Default Terrain File", "default.r32");

                     configData.SetAttribute("TerrainFile", this.estateSettings.terrainFile);

                 }

                 else

@@ -196,7 +196,7 @@ namespace OpenSim.Framework.Types
                 attri = configData.GetAttribute("TerrainMultiplier");

                 if (attri == "")

                 {

-                    string re = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Terrain Height Multiplier", "60.0");

+                    string re = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("GENERAL SETTING: Terrain Height Multiplier", "60.0");

                     this.estateSettings.terrainMultiplier = Convert.ToDouble(re, CultureInfo.InvariantCulture);

                     configData.SetAttribute("TerrainMultiplier", this.estateSettings.terrainMultiplier.ToString());

                 }

@@ -209,7 +209,7 @@ namespace OpenSim.Framework.Types
                 attri = configData.GetAttribute("MasterAvatarFirstName");

                 if (attri == "")

                 {

-                    this.MasterAvatarFirstName = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("First name of Master Avatar (Land and Region Owner)", "Test");

+                    this.MasterAvatarFirstName = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("First name of Master Avatar (Land and Region Owner)", "Test");

 

                     configData.SetAttribute("MasterAvatarFirstName", this.MasterAvatarFirstName);

                 }

@@ -222,7 +222,7 @@ namespace OpenSim.Framework.Types
                 attri = configData.GetAttribute("MasterAvatarLastName");

                 if (attri == "")

                 {

-                    this.MasterAvatarLastName = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Last name of Master Avatar (Land and Region Owner)", "User");

+                    this.MasterAvatarLastName = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Last name of Master Avatar (Land and Region Owner)", "User");

 

                     configData.SetAttribute("MasterAvatarLastName", this.MasterAvatarLastName);

                 }

@@ -237,7 +237,7 @@ namespace OpenSim.Framework.Types
                     attri = configData.GetAttribute("MasterAvatarSandboxPassword");

                     if (attri == "")

                     {

-                        this.MasterAvatarSandboxPassword = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Password of Master Avatar (Needed for sandbox mode account creation only)", "test");

+                        this.MasterAvatarSandboxPassword = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Password of Master Avatar (Needed for sandbox mode account creation only)", "test");

 

                         //Should I store this?

                         configData.SetAttribute("MasterAvatarSandboxPassword", this.MasterAvatarSandboxPassword);

@@ -254,17 +254,17 @@ namespace OpenSim.Framework.Types
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Config.cs:InitConfig() - Exception occured");

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString());

+                OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");

+                OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());

             }

 

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Sim settings loaded:");

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "UUID: " + this.SimUUID.ToStringHyphenated());

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Name: " + this.RegionName);

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Region Handle: " + this.RegionHandle.ToString());

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort);

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Sandbox Mode? " + isSandbox.ToString());

+            OpenSim.Framework.Console.MainLog.Instance.Verbose("Sim settings loaded:");

+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "UUID: " + this.SimUUID.ToStringHyphenated());

+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Name: " + this.RegionName);

+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");

+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Region Handle: " + this.RegionHandle.ToString());

+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort);

+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Sandbox Mode? " + isSandbox.ToString());

   

         }

     }