aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-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
-rw-r--r--OpenSim/Grid/GridServer/Main.cs1
-rw-r--r--OpenSim/Grid/UserServer/Main.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneBase.cs2
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs2
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs4
9 files changed, 12 insertions, 14 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"));
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index 8353066..f9accab 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -43,7 +43,6 @@ namespace OpenSim.Grid.GridServer
43 /// </summary> 43 /// </summary>
44 public class OpenGrid_Main : conscmd_callback 44 public class OpenGrid_Main : conscmd_callback
45 { 45 {
46 private string GridDll = "OpenSim.Framework.Data.MySQL.dll";
47 public GridConfig Cfg; 46 public GridConfig Cfg;
48 47
49 public static OpenGrid_Main thegrid; 48 public static OpenGrid_Main thegrid;
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index a6571cf..111d40d 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -43,7 +43,6 @@ namespace OpenSim.Grid.UserServer
43 /// </summary> 43 /// </summary>
44 public class OpenUser_Main : conscmd_callback 44 public class OpenUser_Main : conscmd_callback
45 { 45 {
46 private string StorageDll = "OpenSim.Framework.Data.MySQL.dll";
47 private UserConfig Cfg; 46 private UserConfig Cfg;
48 47
49 public UserManager m_userManager; 48 public UserManager m_userManager;
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index 3c2193e..fb7624a 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -145,7 +145,7 @@ namespace OpenSim.Region.Environment.Scenes
145 } 145 }
146 catch (Exception e) 146 catch (Exception e)
147 { 147 {
148 MainLog.Instance.WriteLine(LogPriority.HIGH, "World.cs: Close() - Failed with exception " + e.ToString()); 148 MainLog.Instance.Error("SCENE", "World.cs: Close() - Failed with exception " + e.ToString());
149 } 149 }
150 } 150 }
151 151
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index a5bc999..a27cc0c 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -94,7 +94,7 @@ namespace SimpleApp
94 scene.AddEntity(fileObject); 94 scene.AddEntity(fileObject);
95 } 95 }
96 96
97 m_log.WriteLine(LogPriority.NORMAL, "Press enter to quit."); 97 m_log.Notice("Press enter to quit.");
98 m_log.ReadLine(); 98 m_log.ReadLine();
99 } 99 }
100 100
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
index cb77405..6ab4178 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
@@ -54,12 +54,12 @@ namespace OpenSim.Physics.Manager
54 54
55 if(_plugins.ContainsKey(engineName)) 55 if(_plugins.ContainsKey(engineName))
56 { 56 {
57 MainLog.Instance.WriteLine(LogPriority.LOW,"creating "+engineName); 57 MainLog.Instance.Verbose("PHYSICS","creating "+engineName);
58 return _plugins[engineName].GetScene(); 58 return _plugins[engineName].GetScene();
59 } 59 }
60 else 60 else
61 { 61 {
62 MainLog.Instance.WriteLine(LogPriority.MEDIUM,"couldn't find physicsEngine: {0}",engineName); 62 MainLog.Instance.Warn("PHYSICS", "couldn't find physicsEngine: {0}", engineName);
63 throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}",engineName)); 63 throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}",engineName));
64 } 64 }
65 } 65 }