aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs2
-rw-r--r--OpenSim/Framework/Console/LogBase.cs4
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs6
-rw-r--r--OpenSim/Framework/UserManager/LoginResponse.cs4
4 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
index c7d2c9c..d72c40f 100644
--- a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
+++ b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Framework.Configuration.HTTP
54 while (count > 0); 54 while (count > 0);
55 LoadDataFromString(sb.ToString()); 55 LoadDataFromString(sb.ToString());
56 } 56 }
57 catch (Exception e) 57 catch (WebException)
58 { 58 {
59 Console.MainLog.Instance.Warn("Unable to connect to remote configuration file (" + remoteConfigSettings.baseConfigURL + configFileName + "). Creating local file instead."); 59 Console.MainLog.Instance.Warn("Unable to connect to remote configuration file (" + remoteConfigSettings.baseConfigURL + configFileName + "). Creating local file instead.");
60 xmlConfig.SetFileName(configFileName); 60 xmlConfig.SetFileName(configFileName);
diff --git a/OpenSim/Framework/Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs
index 60c77fe..f2b2720 100644
--- a/OpenSim/Framework/Console/LogBase.cs
+++ b/OpenSim/Framework/Console/LogBase.cs
@@ -344,7 +344,7 @@ namespace OpenSim.Framework.Console
344 { 344 {
345 // FIXME: Needs to be better abstracted 345 // FIXME: Needs to be better abstracted
346 Log.WriteLine(prompt); 346 Log.WriteLine(prompt);
347 this.Write(prompt); 347 this.Notice(prompt);
348 ConsoleColor oldfg = System.Console.ForegroundColor; 348 ConsoleColor oldfg = System.Console.ForegroundColor;
349 System.Console.ForegroundColor = System.Console.BackgroundColor; 349 System.Console.ForegroundColor = System.Console.BackgroundColor;
350 string temp = System.Console.ReadLine(); 350 string temp = System.Console.ReadLine();
@@ -355,7 +355,7 @@ namespace OpenSim.Framework.Console
355 // Displays a command prompt and waits for the user to enter a string, then returns that string 355 // Displays a command prompt and waits for the user to enter a string, then returns that string
356 public string CmdPrompt(string prompt) 356 public string CmdPrompt(string prompt)
357 { 357 {
358 this.Write(String.Format("{0}: ", prompt)); 358 this.Notice(String.Format("{0}: ", prompt));
359 return this.ReadLine(); 359 return this.ReadLine();
360 } 360 }
361 361
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 4b3b3de..d0784f3 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -185,7 +185,7 @@ namespace OpenSim.Framework.Servers
185 185
186 public void Start() 186 public void Start()
187 { 187 {
188 MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: Starting up HTTP Server"); 188 MainLog.Instance.Verbose("HTTPD", "BaseHttpServer.cs: Starting up HTTP Server");
189 189
190 m_workerThread = new Thread(new ThreadStart(StartHTTP)); 190 m_workerThread = new Thread(new ThreadStart(StartHTTP));
191 m_workerThread.IsBackground = true; 191 m_workerThread.IsBackground = true;
@@ -196,7 +196,7 @@ namespace OpenSim.Framework.Servers
196 { 196 {
197 try 197 try
198 { 198 {
199 MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: StartHTTP() - Spawned main thread OK"); 199 MainLog.Instance.Status("HTTPD", "BaseHttpServer.cs: StartHTTP() - Spawned main thread OK");
200 m_httpListener = new HttpListener(); 200 m_httpListener = new HttpListener();
201 201
202 m_httpListener.Prefixes.Add("http://+:" + m_port + "/"); 202 m_httpListener.Prefixes.Add("http://+:" + m_port + "/");
@@ -211,7 +211,7 @@ namespace OpenSim.Framework.Servers
211 } 211 }
212 catch (Exception e) 212 catch (Exception e)
213 { 213 {
214 MainLog.Instance.WriteLine(LogPriority.MEDIUM, e.Message); 214 MainLog.Instance.Warn("HTTPD", "Error - " + e.Message);
215 } 215 }
216 } 216 }
217 217
diff --git a/OpenSim/Framework/UserManager/LoginResponse.cs b/OpenSim/Framework/UserManager/LoginResponse.cs
index e1fc391..4d5ec5f 100644
--- a/OpenSim/Framework/UserManager/LoginResponse.cs
+++ b/OpenSim/Framework/UserManager/LoginResponse.cs
@@ -257,8 +257,8 @@ namespace OpenSim.Framework.UserManagement
257 } 257 }
258 catch (Exception e) 258 catch (Exception e)
259 { 259 {
260 MainLog.Instance.WriteLine( 260 MainLog.Instance.Warn(
261 LogPriority.LOW, 261 "CLIENT",
262 "LoginResponse: Error creating XML-RPC Response: " + e.Message 262 "LoginResponse: Error creating XML-RPC Response: " + e.Message
263 ); 263 );
264 return (this.GenerateFailureResponse("Internal Error", "Error generating Login Response", "false")); 264 return (this.GenerateFailureResponse("Internal Error", "Error generating Login Response", "false"));