From 765ff13f22ce062066e461b73f0aa6881b4fea29 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Fri, 20 Jul 2007 01:32:27 +0000 Subject: * Assortment of Console changes - console messages are now grouped into modules (eg "client", "grid", "terrain", "storage", etc) --- OpenSim/Framework/Console/LogBase.cs | 5 +++++ OpenSim/Framework/General/Configuration/ConfigurationMember.cs | 2 +- OpenSim/Framework/UserManager/LoginResponse.cs | 2 -- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'OpenSim/Framework') diff --git a/OpenSim/Framework/Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs index db76861..7d38c3a 100644 --- a/OpenSim/Framework/Console/LogBase.cs +++ b/OpenSim/Framework/Console/LogBase.cs @@ -73,14 +73,18 @@ namespace OpenSim.Framework.Console Log.Close(); } + [Obsolete("Log.WriteLine is obsolete, use Warn / Error / Verbose instead.")] public void Write(string format, params object[] args) { + // HOUSEKEEPING : Will remove once use is removed. Notice(format, args); return; } + [Obsolete("Log.WriteLine is obsolete, use Warn / Error / Verbose instead.")] public void WriteLine(LogPriority importance, string format, params object[] args) { + // HOUSEKEEPING : Will remove once use is removed. Log.WriteLine(format, args); Log.Flush(); if (!m_silent) @@ -249,6 +253,7 @@ namespace OpenSim.Framework.Console private void WritePrefixLine(ConsoleColor color, string sender) { + sender = sender.ToUpper(); Log.WriteLine("[" + sender + "] "); Log.Flush(); diff --git a/OpenSim/Framework/General/Configuration/ConfigurationMember.cs b/OpenSim/Framework/General/Configuration/ConfigurationMember.cs index 4546683..a0d019c 100644 --- a/OpenSim/Framework/General/Configuration/ConfigurationMember.cs +++ b/OpenSim/Framework/General/Configuration/ConfigurationMember.cs @@ -329,7 +329,7 @@ namespace OpenSim.Framework.Configuration } else { - MainLog.Instance.Warn("Incorrect result given, the configuration option must be " + errorMessage + ". Prompting for same option..."); + MainLog.Instance.Warn("configuration","Incorrect result given, the configuration option must be " + errorMessage + ". Prompting for same option..."); ignoreNextFromConfig = true; } } diff --git a/OpenSim/Framework/UserManager/LoginResponse.cs b/OpenSim/Framework/UserManager/LoginResponse.cs index d3dfd5b..326b943 100644 --- a/OpenSim/Framework/UserManager/LoginResponse.cs +++ b/OpenSim/Framework/UserManager/LoginResponse.cs @@ -223,8 +223,6 @@ namespace OpenSim.Framework.UserManagement responseData["sim_port"] =(Int32) this.SimPort; responseData["sim_ip"] = this.SimAddress; - MainLog.Instance.Warn("SIM IP: " + responseData["sim_ip"] + "; SIM PORT: " + responseData["sim_port"]); - responseData["agent_id"] = this.AgentID.ToStringHyphenated(); responseData["session_id"] = this.SessionID.ToStringHyphenated(); responseData["secure_session_id"] = this.SecureSessionID.ToStringHyphenated(); -- cgit v1.1