aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Console/LogBase.cs5
-rw-r--r--OpenSim/Framework/General/Configuration/ConfigurationMember.cs2
-rw-r--r--OpenSim/Framework/UserManager/LoginResponse.cs2
3 files changed, 6 insertions, 3 deletions
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
73 Log.Close(); 73 Log.Close();
74 } 74 }
75 75
76 [Obsolete("Log.WriteLine is obsolete, use Warn / Error / Verbose instead.")]
76 public void Write(string format, params object[] args) 77 public void Write(string format, params object[] args)
77 { 78 {
79 // HOUSEKEEPING : Will remove once use is removed.
78 Notice(format, args); 80 Notice(format, args);
79 return; 81 return;
80 } 82 }
81 83
84 [Obsolete("Log.WriteLine is obsolete, use Warn / Error / Verbose instead.")]
82 public void WriteLine(LogPriority importance, string format, params object[] args) 85 public void WriteLine(LogPriority importance, string format, params object[] args)
83 { 86 {
87 // HOUSEKEEPING : Will remove once use is removed.
84 Log.WriteLine(format, args); 88 Log.WriteLine(format, args);
85 Log.Flush(); 89 Log.Flush();
86 if (!m_silent) 90 if (!m_silent)
@@ -249,6 +253,7 @@ namespace OpenSim.Framework.Console
249 253
250 private void WritePrefixLine(ConsoleColor color, string sender) 254 private void WritePrefixLine(ConsoleColor color, string sender)
251 { 255 {
256 sender = sender.ToUpper();
252 Log.WriteLine("[" + sender + "] "); 257 Log.WriteLine("[" + sender + "] ");
253 Log.Flush(); 258 Log.Flush();
254 259
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
329 } 329 }
330 else 330 else
331 { 331 {
332 MainLog.Instance.Warn("Incorrect result given, the configuration option must be " + errorMessage + ". Prompting for same option..."); 332 MainLog.Instance.Warn("configuration","Incorrect result given, the configuration option must be " + errorMessage + ". Prompting for same option...");
333 ignoreNextFromConfig = true; 333 ignoreNextFromConfig = true;
334 } 334 }
335 } 335 }
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
223 responseData["sim_port"] =(Int32) this.SimPort; 223 responseData["sim_port"] =(Int32) this.SimPort;
224 responseData["sim_ip"] = this.SimAddress; 224 responseData["sim_ip"] = this.SimAddress;
225 225
226 MainLog.Instance.Warn("SIM IP: " + responseData["sim_ip"] + "; SIM PORT: " + responseData["sim_port"]);
227
228 responseData["agent_id"] = this.AgentID.ToStringHyphenated(); 226 responseData["agent_id"] = this.AgentID.ToStringHyphenated();
229 responseData["session_id"] = this.SessionID.ToStringHyphenated(); 227 responseData["session_id"] = this.SessionID.ToStringHyphenated();
230 responseData["secure_session_id"] = this.SecureSessionID.ToStringHyphenated(); 228 responseData["secure_session_id"] = this.SecureSessionID.ToStringHyphenated();