OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Reduced a significant number of compiler warnings (back down to 9 for all projects combined, all 'never used' things)

afrisby
Adam Frisby 2007-07-24 03:59:32 +00:00
parent 87bddd32df
commit 3cbc1e011d
9 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
View File

@ -54,7 +54,7 @@ namespace OpenSim.Framework.Configuration.HTTP
while (count > 0); while (count > 0);
LoadDataFromString(sb.ToString()); LoadDataFromString(sb.ToString());
} }
catch (Exception e) catch (WebException)
{ {
Console.MainLog.Instance.Warn("Unable to connect to remote configuration file (" + remoteConfigSettings.baseConfigURL + configFileName + "). Creating local file instead."); Console.MainLog.Instance.Warn("Unable to connect to remote configuration file (" + remoteConfigSettings.baseConfigURL + configFileName + "). Creating local file instead.");
xmlConfig.SetFileName(configFileName); xmlConfig.SetFileName(configFileName);

4
OpenSim/Framework/Console/LogBase.cs
View File

@ -344,7 +344,7 @@ namespace OpenSim.Framework.Console
{ {
// FIXME: Needs to be better abstracted // FIXME: Needs to be better abstracted
Log.WriteLine(prompt); Log.WriteLine(prompt);
this.Write(prompt); this.Notice(prompt);
ConsoleColor oldfg = System.Console.ForegroundColor; ConsoleColor oldfg = System.Console.ForegroundColor;
System.Console.ForegroundColor = System.Console.BackgroundColor; System.Console.ForegroundColor = System.Console.BackgroundColor;
string temp = System.Console.ReadLine(); string temp = System.Console.ReadLine();
@ -355,7 +355,7 @@ namespace OpenSim.Framework.Console
// Displays a command prompt and waits for the user to enter a string, then returns that string // Displays a command prompt and waits for the user to enter a string, then returns that string
public string CmdPrompt(string prompt) public string CmdPrompt(string prompt)
{ {
this.Write(String.Format("{0}: ", prompt)); this.Notice(String.Format("{0}: ", prompt));
return this.ReadLine(); return this.ReadLine();
} }

6
OpenSim/Framework/Servers/BaseHttpServer.cs
View File

@ -185,7 +185,7 @@ namespace OpenSim.Framework.Servers
public void Start() public void Start()
{ {
MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: Starting up HTTP Server"); MainLog.Instance.Verbose("HTTPD", "BaseHttpServer.cs: Starting up HTTP Server");
m_workerThread = new Thread(new ThreadStart(StartHTTP)); m_workerThread = new Thread(new ThreadStart(StartHTTP));
m_workerThread.IsBackground = true; m_workerThread.IsBackground = true;
@ -196,7 +196,7 @@ namespace OpenSim.Framework.Servers
{ {
try try
{ {
MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: StartHTTP() - Spawned main thread OK"); MainLog.Instance.Status("HTTPD", "BaseHttpServer.cs: StartHTTP() - Spawned main thread OK");
m_httpListener = new HttpListener(); m_httpListener = new HttpListener();
m_httpListener.Prefixes.Add("http://+:" + m_port + "/"); m_httpListener.Prefixes.Add("http://+:" + m_port + "/");
@ -211,7 +211,7 @@ namespace OpenSim.Framework.Servers
} }
catch (Exception e) catch (Exception e)
{ {
MainLog.Instance.WriteLine(LogPriority.MEDIUM, e.Message); MainLog.Instance.Warn("HTTPD", "Error - " + e.Message);
} }
} }

4
OpenSim/Framework/UserManager/LoginResponse.cs
View File

@ -257,8 +257,8 @@ namespace OpenSim.Framework.UserManagement
} }
catch (Exception e) catch (Exception e)
{ {
MainLog.Instance.WriteLine( MainLog.Instance.Warn(
LogPriority.LOW, "CLIENT",
"LoginResponse: Error creating XML-RPC Response: " + e.Message "LoginResponse: Error creating XML-RPC Response: " + e.Message
); );
return (this.GenerateFailureResponse("Internal Error", "Error generating Login Response", "false")); return (this.GenerateFailureResponse("Internal Error", "Error generating Login Response", "false"));

1
OpenSim/Grid/GridServer/Main.cs
View File

@ -43,7 +43,6 @@ namespace OpenSim.Grid.GridServer
/// </summary> /// </summary>
public class OpenGrid_Main : conscmd_callback public class OpenGrid_Main : conscmd_callback
{ {
private string GridDll = "OpenSim.Framework.Data.MySQL.dll";
public GridConfig Cfg; public GridConfig Cfg;
public static OpenGrid_Main thegrid; public static OpenGrid_Main thegrid;

1
OpenSim/Grid/UserServer/Main.cs
View File

@ -43,7 +43,6 @@ namespace OpenSim.Grid.UserServer
/// </summary> /// </summary>
public class OpenUser_Main : conscmd_callback public class OpenUser_Main : conscmd_callback
{ {
private string StorageDll = "OpenSim.Framework.Data.MySQL.dll";
private UserConfig Cfg; private UserConfig Cfg;
public UserManager m_userManager; public UserManager m_userManager;

2
OpenSim/Region/Environment/Scenes/SceneBase.cs
View File

@ -145,7 +145,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
catch (Exception e) catch (Exception e)
{ {
MainLog.Instance.WriteLine(LogPriority.HIGH, "World.cs: Close() - Failed with exception " + e.ToString()); MainLog.Instance.Error("SCENE", "World.cs: Close() - Failed with exception " + e.ToString());
} }
} }

2
OpenSim/Region/Examples/SimpleApp/Program.cs
View File

@ -94,7 +94,7 @@ namespace SimpleApp
scene.AddEntity(fileObject); scene.AddEntity(fileObject);
} }
m_log.WriteLine(LogPriority.NORMAL, "Press enter to quit."); m_log.Notice("Press enter to quit.");
m_log.ReadLine(); m_log.ReadLine();
} }

4
OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
View File

@ -54,12 +54,12 @@ namespace OpenSim.Physics.Manager
if(_plugins.ContainsKey(engineName)) if(_plugins.ContainsKey(engineName))
{ {
MainLog.Instance.WriteLine(LogPriority.LOW,"creating "+engineName); MainLog.Instance.Verbose("PHYSICS","creating "+engineName);
return _plugins[engineName].GetScene(); return _plugins[engineName].GetScene();
} }
else else
{ {
MainLog.Instance.WriteLine(LogPriority.MEDIUM,"couldn't find physicsEngine: {0}",engineName); MainLog.Instance.Warn("PHYSICS", "couldn't find physicsEngine: {0}", engineName);
throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}",engineName)); throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}",engineName));
} }
} }